From 321a213e801cc131b89c44b4a54c641130964dc6 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 14 Feb 2019 13:15:54 +0000
Subject: [PATCH 01/47] WIP feedback disambiguation redesign

---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../duckduckgo/app/browser/BrowserActivity.kt |   2 +
 .../app/feedback/ui/FeedbackActivity.kt       |  50 +-----
 .../app/feedback/ui/FeedbackViewModel.kt      |  52 ------
 .../res/drawable/ic_positive_feedback.xml     |  27 ++++
 app/src/main/res/layout/activity_feedback.xml | 152 +-----------------
 app/src/main/res/layout/content_feedback.xml  |  72 +++++++++
 app/src/main/res/values/strings.xml           |   2 +-
 8 files changed, 116 insertions(+), 244 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_positive_feedback.xml
 create mode 100644 app/src/main/res/layout/content_feedback.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17ad677c4ebd..003867d0cbec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,8 +109,7 @@
             android:parentActivityName=".BrowserActivity" />
         <activity
             android:name="com.duckduckgo.app.feedback.ui.FeedbackActivity"
-            android:label="@string/feedbackActivityTitle"
-            android:theme="@style/ModalCardTheme" />
+            android:label="@string/feedbackActivityTitle" />
         <activity
             android:name="com.duckduckgo.app.feedback.ui.SurveyActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
index be1ed6fd7a10..e51ed5b29d11 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
@@ -91,6 +91,8 @@ class BrowserActivity : DuckDuckGoActivity(), AppEnjoymentDialogFragment.Listene
             renderer.renderBrowserViewState(it)
         })
         viewModel.awaitClearDataFinishedNotification()
+
+        startActivity(FeedbackActivity.intent(this, brokenSite = false))
     }
 
     override fun onNewIntent(intent: Intent?) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
index ccdf927f2105..cd18c66d8c7f 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
@@ -19,16 +19,12 @@ package com.duckduckgo.app.feedback.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.text.Editable
-import android.widget.EditText
-import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.FeedbackViewModel.Command
 import com.duckduckgo.app.feedback.ui.FeedbackViewModel.ViewState
 import com.duckduckgo.app.global.DuckDuckGoActivity
-import com.duckduckgo.app.global.view.TextChangedWatcher
-import kotlinx.android.synthetic.main.activity_feedback.*
+import kotlinx.android.synthetic.main.include_toolbar.*
 import org.jetbrains.anko.longToast
 
 
@@ -39,39 +35,17 @@ class FeedbackActivity : DuckDuckGoActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_feedback)
+        setupActionBar()
         configureListeners()
         configureObservers()
-
-        if (savedInstanceState == null) {
-            consumeIntentExtra()
-        }
     }
 
-    private fun consumeIntentExtra() {
-        val brokenSite = intent.getBooleanExtra(BROKEN_SITE_EXTRA, false)
-        if (brokenSite) {
-            val url = intent.getStringExtra(URL_EXTRA)
-            viewModel.setInitialBrokenSite(url)
-        }
+    private fun setupActionBar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     private fun configureListeners() {
-        brokenSiteSwitch.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.onBrokenSiteChanged(isChecked)
-        }
-        feedbackMessage.addTextChangedListener(object : TextChangedWatcher() {
-            override fun afterTextChanged(editable: Editable) {
-                viewModel.onFeedbackMessageChanged(editable.toString())
-            }
-        })
-        brokenSiteUrl.addTextChangedListener(object : TextChangedWatcher() {
-            override fun afterTextChanged(editable: Editable) {
-                viewModel.onBrokenSiteUrlChanged(editable.toString())
-            }
-        })
-        submitButton.setOnClickListener {
-            viewModel.onSubmitPressed()
-        }
     }
 
     private fun configureObservers() {
@@ -85,8 +59,6 @@ class FeedbackActivity : DuckDuckGoActivity() {
 
     private fun processCommand(command: Command) {
         when (command) {
-            Command.FocusUrl -> brokenSiteUrl.requestFocus()
-            Command.FocusMessage -> feedbackMessage.requestFocus()
             Command.ConfirmAndFinish -> confirmAndFinish()
         }
     }
@@ -97,18 +69,6 @@ class FeedbackActivity : DuckDuckGoActivity() {
     }
 
     private fun render(viewState: ViewState) {
-        val messageHint = if (viewState.isBrokenSite) R.string.feedbackBrokenSiteHint else R.string.feedbackMessageHint
-        brokenSiteSwitch.isChecked = viewState.isBrokenSite
-        brokenSiteUrl.isVisible = viewState.showUrl
-        brokenSiteUrl.updateText(viewState.url ?: "")
-        feedbackMessage.setHint(messageHint)
-        submitButton.isEnabled = viewState.submitAllowed
-    }
-
-    private fun EditText.updateText(newText: String) {
-        if (text.toString() != newText) {
-            setText(newText)
-        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
index d55d68c0f0a6..c6113eedcc51 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
@@ -33,8 +33,6 @@ class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel(
     )
 
     sealed class Command {
-        object FocusUrl : Command()
-        object FocusMessage : Command()
         object ConfirmAndFinish : Command()
     }
 
@@ -47,56 +45,6 @@ class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel(
         viewState.value = ViewState()
     }
 
-    fun setInitialBrokenSite(url: String?) {
-        onBrokenSiteUrlChanged(url)
-        onBrokenSiteChanged(true)
-    }
-
-    fun onBrokenSiteChanged(isBroken: Boolean) {
-        if (isBroken == viewState.value?.isBrokenSite) {
-            return
-        }
-
-        viewState.value = viewState.value?.copy(
-            isBrokenSite = isBroken,
-            showUrl = isBroken,
-            submitAllowed = canSubmit(isBroken, viewValue.url, viewValue.message)
-        )
-
-        if (isBroken && viewValue.url.isNullOrBlank()) {
-            command.value = Command.FocusUrl
-        } else {
-            command.value = Command.FocusMessage
-        }
-    }
-
-    fun onBrokenSiteUrlChanged(newUrl: String?) {
-        viewState.value = viewState.value?.copy(
-            url = newUrl,
-            submitAllowed = canSubmit(viewValue.isBrokenSite, newUrl, viewValue.message)
-        )
-    }
-
-    fun onFeedbackMessageChanged(newMessage: String?) {
-        viewState.value = viewState.value?.copy(
-            message = newMessage,
-            submitAllowed = canSubmit(viewValue.isBrokenSite, viewValue.url, newMessage)
-        )
-    }
-
-    private fun canSubmit(isBrokenSite: Boolean, url: String?, feedbackMessage: String?): Boolean {
-
-        if (feedbackMessage.isNullOrBlank()) {
-            return false
-        }
-
-        if (isBrokenSite && url.isNullOrBlank()) {
-            return false
-        }
-
-        return true
-    }
-
     fun onSubmitPressed() {
 
         val message = viewValue.message ?: return
diff --git a/app/src/main/res/drawable/ic_positive_feedback.xml b/app/src/main/res/drawable/ic_positive_feedback.xml
new file mode 100644
index 000000000000..509a279753cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_positive_feedback.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="110"
+    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index cb237e66fe86..d5aa61aa861e 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -14,154 +14,18 @@
   ~ limitations under the License.
   -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="com.duckduckgo.app.feedback.ui.FeedbackActivity">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/feedbackCardHorizontalMargin"
-            android:layout_marginTop="@dimen/feedbackCardVerticalMargin"
-            android:layout_marginEnd="@dimen/feedbackCardHorizontalMargin"
-            android:layout_marginBottom="@dimen/feedbackCardVerticalMargin"
-            android:background="@drawable/notification_info_bottom_background"
-            android:paddingBottom="30dp">
-
-            <View
-                android:id="@+id/titleSection"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="@drawable/notification_info_top_background"
-                android:elevation="4dp"
-                android:gravity="center_horizontal"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="@+id/description"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="26dp"
-                android:layout_height="26dp"
-                android:layout_marginTop="30dp"
-                android:elevation="@dimen/modalCardHeaderElevation"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_icon_heart_26dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/titleSection" />
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:elevation="@dimen/modalCardHeaderElevation"
-                android:text="@string/feedbackHeading"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="@dimen/modalCardTitleTextSize"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/icon" />
-
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginBottom="19dp"
-                android:elevation="@dimen/modalCardHeaderElevation"
-                android:lineSpacingExtra="4sp"
-                android:paddingStart="20dp"
-                android:paddingEnd="20dp"
-                android:paddingBottom="30dp"
-                android:text="@string/feedbackModalDescription"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="@dimen/modalCardDescriptionTextSize"
-                app:layout_constraintTop_toBottomOf="@id/title" />
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/brokenSiteSwitch"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/feedbackFormFieldsMargin"
-                android:fontFamily="sans-serif-medium"
-                android:paddingStart="3dp"
-                android:paddingEnd="0dp"
-                android:text="@string/feedbackReportBrokenSite"
-                android:textColor="@color/warmerGray"
-                android:textSize="@dimen/modalCardSwitchTextSize"
-                android:textStyle="normal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/description"
-                tools:checked="true" />
-
-            <EditText
-                android:id="@+id/brokenSiteUrl"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/feedbackFormFieldsMargin"
-                android:hint="@string/feedbackUrlHint"
-                android:imeOptions="flagNoExtractUi"
-                android:inputType="textUri"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:singleLine="true"
-                android:textSize="@dimen/modalCardEditTextSize"
-                android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/brokenSiteSwitch"
-                tools:visibility="visible" />
-
-            <EditText
-                android:id="@+id/feedbackMessage"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/feedbackFormFieldsMargin"
-                android:hint="@string/feedbackMessageHint"
-                android:imeOptions="flagNoExtractUi"
-                android:inputType="textMultiLine"
-                android:lineSpacingExtra="5sp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
-                android:textSize="@dimen/modalCardEditTextSize"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/brokenSiteUrl" />
-
-            <Button
-                android:id="@+id/submitButton"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="20dp"
-                android:layout_marginBottom="30dp"
-                android:background="@drawable/button_contained_bg"
-                android:text="@string/feedbackSubmitButton"
-                android:textColor="@color/white"
-                android:textSize="@dimen/modalCardMajorButtonTextSize"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/feedbackMessage" />
+    <include layout="@layout/include_toolbar" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+    <include layout="@layout/content_feedback" />
 
-    </LinearLayout>
+</LinearLayout>
 
-</ScrollView>
 
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
new file mode 100644
index 000000000000..c9e08cc2148d
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<androidx.constraintlayout.widget.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="match_parent"
+    android:background="@color/whiteThree">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="65dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="Let's get started!"
+        android:textColor="@color/almostBlackDark"
+        android:textSize="22sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="38dp"
+        android:layout_marginTop="9dp"
+        android:layout_marginEnd="38dp"
+        android:text="How would you categorize your feedback?"
+        android:textColor="@color/almostBlack"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <ImageView
+        android:id="@+id/positiveFeedbackButton"
+        android:contentDescription="Positive feedback button"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginTop="34dp"
+        android:src="@drawable/ic_positive_feedback"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/subtitle" />
+
+    <ImageView
+        android:id="@+id/negativeFeedbackButton"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:contentDescription="Negative feedback button"
+        android:layout_marginStart="211dp"
+        android:src="@drawable/ic_positive_feedback"
+        app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/positiveFeedbackButton"
+        app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a7d8831088a..74cea39287ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,7 +189,7 @@
     <string name="no_suggestions">No Suggestions</string>
 
     <!-- Feedback Activity -->
-    <string name="feedbackActivityTitle">Feedback</string>
+    <string name="feedbackActivityTitle">Share Your Feedback</string>
     <string name="feedbackReportBrokenSiteMenuItem">Report Broken Site</string>
     <string name="feedbackHeading">Share Your Feedback</string>
     <string name="feedbackModalDescription">Anonymously share your feedback to help us improve the DuckDuckGo Privacy Browser</string>

From 1e2dd84f28f233980df5efd2d53f78526a6cc5be Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 15 Feb 2019 10:37:33 +0000
Subject: [PATCH 02/47] WIP updates to feedback UI

---
 .../app/feedback/ui/FeedbackActivity.kt       | 11 ++++
 .../app/feedback/ui/FeedbackViewModel.kt      | 26 +++++++--
 .../feedback/ui/InitialFeedbackFragment.kt    | 29 ++++++++++
 .../res/drawable/ic_negative_feedback.xml     | 27 +++++++++
 .../report_broken_site_button_outlined_bg.xml | 23 ++++++++
 app/src/main/res/layout/activity_feedback.xml |  6 +-
 app/src/main/res/layout/content_feedback.xml  | 55 +++++++++++++++++--
 app/src/main/res/values-land/dimens.xml       | 20 +++++++
 app/src/main/res/values/dimens.xml            |  1 +
 9 files changed, 185 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_negative_feedback.xml
 create mode 100644 app/src/main/res/drawable/report_broken_site_button_outlined_bg.xml
 create mode 100644 app/src/main/res/values-land/dimens.xml

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
index cd18c66d8c7f..f96c7f53f13d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
@@ -24,6 +24,7 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.FeedbackViewModel.Command
 import com.duckduckgo.app.feedback.ui.FeedbackViewModel.ViewState
 import com.duckduckgo.app.global.DuckDuckGoActivity
+import kotlinx.android.synthetic.main.content_feedback.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 import org.jetbrains.anko.longToast
 
@@ -46,6 +47,9 @@ class FeedbackActivity : DuckDuckGoActivity() {
     }
 
     private fun configureListeners() {
+        positiveFeedbackButton.setOnClickListener { viewModel.onPositiveFeedback() }
+        negativeFeedbackButton.setOnClickListener { viewModel.onNegativeFeedback() }
+        reportBrokenSiteButton.setOnClickListener { viewModel.onReportBrokenSite() }
     }
 
     private fun configureObservers() {
@@ -71,6 +75,13 @@ class FeedbackActivity : DuckDuckGoActivity() {
     private fun render(viewState: ViewState) {
     }
 
+    private fun showInitialFeedbackView() {
+//        val fragment =
+//        val transaction = supportFragmentManager.beginTransaction()
+//        transaction.replace(R.id.fragmentContainer, fragment)
+//        transaction.commit()
+    }
+
     companion object {
 
         private const val BROKEN_SITE_EXTRA = "BROKEN_SITE_EXTRA"
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
index c6113eedcc51..3135a2d30f1c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
@@ -20,16 +20,17 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.feedback.api.FeedbackSender
 import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
 
 
 class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel() {
 
     data class ViewState(
-        val isBrokenSite: Boolean = false,
-        val url: String? = null,
-        val showUrl: Boolean = false,
-        val message: String? = null,
-        val submitAllowed: Boolean = false
+            val isBrokenSite: Boolean = false,
+            val url: String? = null,
+            val showUrl: Boolean = false,
+            val message: String? = null,
+            val submitAllowed: Boolean = false
     )
 
     sealed class Command {
@@ -39,7 +40,8 @@ class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel(
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
-    private val viewValue: ViewState get() = viewState.value!!
+    private val viewValue: ViewState
+        get() = viewState.value!!
 
     init {
         viewState.value = ViewState()
@@ -59,4 +61,16 @@ class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel(
         command.value = Command.ConfirmAndFinish
     }
 
+    fun onPositiveFeedback() {
+        Timber.i("User is giving positive feedback")
+    }
+
+    fun onNegativeFeedback() {
+        Timber.i("User is giving negative feedback")
+    }
+
+    fun onReportBrokenSite() {
+        Timber.i("User wants to report broken site")
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
new file mode 100644
index 000000000000..38218efb21a6
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+
+
+class InitialFeedbackFragment : Fragment() {
+
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_negative_feedback.xml b/app/src/main/res/drawable/ic_negative_feedback.xml
new file mode 100644
index 000000000000..0a296e9a5692
--- /dev/null
+++ b/app/src/main/res/drawable/ic_negative_feedback.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="110"
+    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/report_broken_site_button_outlined_bg.xml b/app/src/main/res/drawable/report_broken_site_button_outlined_bg.xml
new file mode 100644
index 000000000000..a56aa21216c2
--- /dev/null
+++ b/app/src/main/res/drawable/report_broken_site_button_outlined_bg.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/cornflowerBlue" />
+
+    <corners android:radius="2dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index d5aa61aa861e..cb00c3561096 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -24,7 +24,11 @@
 
     <include layout="@layout/include_toolbar" />
 
-    <include layout="@layout/content_feedback" />
+    <FrameLayout
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index c9e08cc2148d..20e188a74aa8 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -25,7 +25,7 @@
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="65dp"
+        android:layout_marginTop="@dimen/feedbackTitleMarginTop"
         android:fontFamily="sans-serif-medium"
         android:text="Let's get started!"
         android:textColor="@color/almostBlackDark"
@@ -38,22 +38,29 @@
         android:id="@+id/subtitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="38dp"
         android:layout_marginStart="38dp"
         android:layout_marginTop="9dp"
-        android:layout_marginEnd="38dp"
+        android:fontFamily="sans-serif"
         android:text="How would you categorize your feedback?"
         android:textColor="@color/almostBlack"
+        android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title" />
 
     <ImageView
         android:id="@+id/positiveFeedbackButton"
-        android:contentDescription="Positive feedback button"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:layout_marginTop="34dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:contentDescription="Positive feedback button"
+        android:focusable="true"
         android:src="@drawable/ic_positive_feedback"
+        app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
+        app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
@@ -61,12 +68,48 @@
         android:id="@+id/negativeFeedbackButton"
         android:layout_width="100dp"
         android:layout_height="100dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+
         android:contentDescription="Negative feedback button"
-        android:layout_marginStart="211dp"
-        android:src="@drawable/ic_positive_feedback"
+        android:src="@drawable/ic_negative_feedback"
         app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/positiveFeedbackButton"
+        app:layout_constraintStart_toEndOf="@id/positiveFeedbackButton"
         app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton" />
 
+    <Button
+        android:id="@+id/reportBrokenSiteButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginStart="20dp"
+        android:background="@drawable/report_broken_site_button_outlined_bg"
+        android:foreground="?attr/selectableItemBackground"
+        android:text="REPORT BROKEN SITE"
+        android:textColor="@color/cornflowerBlue"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@id/bottomInfoCard"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <View
+        android:id="@+id/bottomInfoCard"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:background="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:text="Your anonymous feedback is important to us"
+        android:textColor="@color/warmerGray"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="@id/bottomInfoCard"
+        app:layout_constraintEnd_toEndOf="@id/bottomInfoCard"
+        app:layout_constraintStart_toStartOf="@id/bottomInfoCard"
+        app:layout_constraintTop_toTopOf="@id/bottomInfoCard" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 000000000000..b1b71df71b2a
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<resources>
+    <dimen name="feedbackTitleMarginTop">20dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 89a41627935e..9ef233c3824d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -32,6 +32,7 @@
     <dimen name="feedbackCardVerticalMargin">16dp</dimen>
     <dimen name="feedbackFormFieldsMargin">16dp</dimen>
     <dimen name="feedbackCardHorizontalMargin">16dp</dimen>
+    <dimen name="feedbackTitleMarginTop">65dp</dimen>
 
     <dimen name="settingsItemHorizontalPadding">20dp</dimen>
 

From 80897a2e4408f6db894e7305a909e77c45683182 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 11 Mar 2019 17:45:53 +0000
Subject: [PATCH 03/47] WIP build feedback disambiguation screens

---
 app/build.gradle                              |  14 +-
 .../app/bookmarks/db/BookmarksDaoTest.kt      |   4 +-
 .../bookmarks/ui/BookmarksViewModelTest.kt    |   2 +-
 .../app/browser/BrowserTabViewModelTest.kt    |   4 +-
 .../app/feedback/ui/FeedbackViewModelTest.kt  |   6 +-
 .../app/global/db/AppDatabaseTest.kt          |   6 +-
 app/src/main/AndroidManifest.xml              |   8 +-
 .../app/brokensite/BrokenSiteActivity.kt      | 129 ++++++++++
 .../app/brokensite/BrokenSiteViewModel.kt     | 114 +++++++++
 .../duckduckgo/app/browser/BrowserActivity.kt |   9 +-
 .../app/browser/BrowserTabFragment.kt         |   2 +-
 .../app/browser/BrowserTabViewModel.kt        |  19 +-
 .../app/browser/rating/ui/EnjoymentDialog.kt  |   2 +-
 .../duckduckgo/app/di/AndroidBindingModule.kt |  26 +-
 .../app/feedback/ui/FeedbackActivity.kt       | 100 --------
 .../app/feedback/ui/FeedbackViewModel.kt      |  76 ------
 .../feedback/ui/InitialFeedbackFragment.kt    |  29 ---
 .../feedback/ui/common/FeedbackActivity.kt    | 229 ++++++++++++++++++
 .../feedback/ui/common/FeedbackFragment.kt    |  52 ++++
 .../ui/common/FeedbackItemDecoration.kt       |  71 ++++++
 .../feedback/ui/common/FeedbackViewModel.kt   | 148 +++++++++++
 .../ui/initial/InitialFeedbackFragment.kt     |  72 ++++++
 .../InitialFeedbackFragmentViewModel.kt       |  44 ++++
 .../app/feedback/ui/negative/FeedbackType.kt  |  67 +++++
 .../MainReasonNegativeFeedbackFragment.kt     |  73 ++++++
 .../MainReasonNegativeFeedbackViewModel.kt    |  52 ++++
 .../ui/negative/initial/SubReasonAdapter.kt   |  62 +++++
 .../SubReasonNegativeFeedbackFragment.kt      | 212 ++++++++++++++++
 .../SubReasonNegativeFeedbackViewModel.kt     |  50 ++++
 .../ShareOpenEndedNegativeFeedbackFragment.kt |  88 +++++++
 ...ShareOpenEndedNegativeFeedbackViewModel.kt |  49 ++++
 .../PositiveFeedbackLandingFragment.kt        |  89 +++++++
 .../PositiveFeedbackLandingViewModel.kt       |  65 +++++
 .../ShareOpenEndedPositiveFeedbackFragment.kt |  73 ++++++
 ...ShareOpenEndedPositiveFeedbackViewModel.kt |  49 ++++
 .../duckduckgo/app/global/ViewModelFactory.kt |  20 +-
 .../duckduckgo/app/global/db/AppDatabase.kt   |   2 +-
 .../app/global/model/SiteFactory.kt           |   2 -
 .../app/global/model/SiteMonitor.kt           |  42 ++--
 .../app/onboarding/ui/OnboardingActivity.kt   |   4 +-
 .../onboarding/ui/OnboardingPageFragment.kt   |   2 +-
 .../app/onboarding/ui/PagerAdapter.kt         |  12 +-
 .../app/settings/SettingsActivity.kt          |  24 +-
 .../SettingsAutomaticallyClearWhatFragment.kt |  16 +-
 .../SettingsAutomaticallyClearWhenFragment.kt |  22 +-
 app/src/main/res/anim/slide_from_left.xml     |  23 ++
 app/src/main/res/anim/slide_from_right.xml    |  23 ++
 app/src/main/res/anim/slide_to_left.xml       |  23 ++
 app/src/main/res/anim/slide_to_right.xml      |  23 ++
 .../res/color/feedback_input_box_border.xml   |  22 ++
 .../main/res/drawable/button_contained_bg.xml |  10 +-
 .../res/drawable/feedback_list_divider.xml    |  25 ++
 .../res/drawable/ic_arrow_android_right.xml   |  20 ++
 .../res/drawable/ic_negative_feedback.xml     |  16 +-
 .../drawable/ic_negative_feedback_button.xml  |  27 +++
 .../res/drawable/ic_positive_feedback.xml     |  16 +-
 .../drawable/ic_positive_feedback_button.xml  |  27 +++
 .../main/res/layout/activity_broken_site.xml  | 167 +++++++++++++
 app/src/main/res/layout/activity_feedback.xml |  10 +-
 .../main/res/layout/activity_user_survey.xml  |   2 +-
 app/src/main/res/layout/content_feedback.xml  | 161 ++++++------
 ...ck_negative_disambiguation_main_reason.xml | 200 +++++++++++++++
 ...ack_negative_disambiguation_sub_reason.xml |  82 +++++++
 ..._feedback_negative_open_ended_feedback.xml | 116 +++++++++
 .../content_feedback_positive_landing.xml     | 118 +++++++++
 ..._feedback_positive_open_ended_feedback.xml | 115 +++++++++
 app/src/main/res/layout/content_test.xml      |  44 ++++
 .../main/res/layout/item_feedback_reason.xml  |  42 ++++
 .../res/layout/popup_window_browser_menu.xml  |   2 +-
 app/src/main/res/values/integers.xml          |  20 ++
 .../strings-feedback-disambiguation.xml       |  72 ++++++
 app/src/main/res/values/strings.xml           |  25 +-
 app/src/main/res/values/styles.xml            |  20 ++
 build.gradle                                  |   4 +-
 74 files changed, 3280 insertions(+), 416 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
 create mode 100644 app/src/main/res/anim/slide_from_left.xml
 create mode 100644 app/src/main/res/anim/slide_from_right.xml
 create mode 100644 app/src/main/res/anim/slide_to_left.xml
 create mode 100644 app/src/main/res/anim/slide_to_right.xml
 create mode 100644 app/src/main/res/color/feedback_input_box_border.xml
 create mode 100644 app/src/main/res/drawable/feedback_list_divider.xml
 create mode 100644 app/src/main/res/drawable/ic_arrow_android_right.xml
 create mode 100644 app/src/main/res/drawable/ic_negative_feedback_button.xml
 create mode 100644 app/src/main/res/drawable/ic_positive_feedback_button.xml
 create mode 100644 app/src/main/res/layout/activity_broken_site.xml
 create mode 100644 app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
 create mode 100644 app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
 create mode 100644 app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
 create mode 100644 app/src/main/res/layout/content_feedback_positive_landing.xml
 create mode 100644 app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml
 create mode 100644 app/src/main/res/layout/content_test.xml
 create mode 100644 app/src/main/res/layout/item_feedback_reason.xml
 create mode 100644 app/src/main/res/values/integers.xml
 create mode 100644 app/src/main/res/values/strings-feedback-disambiguation.xml

diff --git a/app/build.gradle b/app/build.gradle
index 5cc627758804..85938c5606e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,8 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
+apply plugin: 'org.jetbrains.kotlin.android.extensions'
+
 ext {
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
@@ -74,18 +76,23 @@ android {
         println "Signing properties not found at ${propertiesPath}, releases will NOT succeed"
         android.buildTypes.release.signingConfig = null
     }
+
+    androidExtensions {
+        experimental = true
+    }
 }
 
 ext {
     androidX = "1.0.2"
-    materialDesign = "1.1.0-alpha02"
+    materialDesign = "1.0.0"
     architectureComponents = "1.1.1"
     architectureComponentsExtensions = "1.1.1"
     androidKtx = "1.0.1"
+    fragmentKtx = "1.0.0"
     constraintLayout = "2.0.0-alpha3"
     lifecycle = "2.0.0"
     room = "2.1.0-alpha04"
-    workManager = "1.0.0-beta03"
+    workManager = "1.0.0-rc01"
     legacySupport = "1.0.0"
     espressoCore = "3.1.1"
     coreTesting = "2.0.0"
@@ -112,6 +119,8 @@ ext {
 
 dependencies {
     implementation "androidx.legacy:legacy-support-v4:$legacySupport"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-beta01'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanary"
 
@@ -139,6 +148,7 @@ dependencies {
 
     // Android KTX
     implementation "androidx.core:core-ktx:$androidKtx"
+    implementation "androidx.fragment:fragment-ktx:$fragmentKtx"
 
     // ViewModel and LiveData
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
index d35f7023c3a0..aa6071e7db02 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
@@ -51,7 +51,7 @@ class BookmarksDaoTest {
 
     @Test
     fun whenBookmarkDeleteThenItIsNoLongerInTheList() {
-        val bookmark = BookmarkEntity(id = 1, title = "title", url = "www.example.com")
+        val bookmark = BookmarkEntity(id = 1, title = "reasonTextView", url = "www.example.com")
         dao.insert(bookmark)
         dao.delete(bookmark)
         val list = dao.bookmarks().blockingObserve()
@@ -60,7 +60,7 @@ class BookmarksDaoTest {
 
     @Test
     fun whenBookmarkAddedThenItIsInList() {
-        val bookmark = BookmarkEntity(id = 1, title = "title", url = "www.example.com")
+        val bookmark = BookmarkEntity(id = 1, title = "reasonTextView", url = "www.example.com")
         dao.insert(bookmark)
         val list = dao.bookmarks().blockingObserve()
         assertEquals(listOf(bookmark), list)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
index ebbca94a3ee4..74cbd9e80293 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
@@ -47,7 +47,7 @@ class BookmarksViewModelTest {
     private val commandObserver: Observer<BookmarksViewModel.Command> = mock()
     private val bookmarksDao: BookmarksDao = mock()
 
-    private val bookmark = BookmarkEntity(title = "title", url = "www.example.com")
+    private val bookmark = BookmarkEntity(title = "reasonTextView", url = "www.example.com")
 
     private val testee: BookmarksViewModel by lazy {
         val model = BookmarksViewModel(bookmarksDao)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
index 6e0769474a08..f77a28a40945 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -284,8 +284,8 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenBookmarkAddedThenDaoIsUpdatedAndUserNotified() {
-        testee.onBookmarkSaved(null, "A title", "www.example.com")
-        verify(bookmarksDao).insert(BookmarkEntity(title = "A title", url = "www.example.com"))
+        testee.onBookmarkSaved(null, "A reasonTextView", "www.example.com")
+        verify(bookmarksDao).insert(BookmarkEntity(title = "A reasonTextView", url = "www.example.com"))
         verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertTrue(commandCaptor.lastValue is DisplayMessage)
     }
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt
index 91295a8140d8..9bbb0beeee01 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt
@@ -4,7 +4,9 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.feedback.api.FeedbackSender
-import com.duckduckgo.app.feedback.ui.FeedbackViewModel.Command
+import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
+import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel.Command
+import com.duckduckgo.app.feedback.ui.positive.initial.Command
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
@@ -41,7 +43,7 @@ class FeedbackViewModelTest {
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
-        testee = FeedbackViewModel(mockFeedbackSender)
+        testee = com.duckduckgo.app.brokensite.FeedbackViewModel(mockFeedbackSender)
         testee.command.observeForever(mockCommandObserver)
     }
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
index 7392e7360428..3641b140dd10 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
@@ -70,8 +70,8 @@ class AppDatabaseTest {
     fun whenMigratingFromVersion4To5ThenUpdatePositionsOfStoredTabs() {
 
         testHelper.createDatabase(TEST_DB_NAME, 4).use {
-            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', 'title') ")
-            it.execSQL("INSERT INTO `tabs` values ('tabid2', 'url', 'title') ")
+            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', rreasonTextViewTextView) ")
+            it.execSQL("INSERT INTO `tabs` values ('tabid2', 'reasonTextView reasonTextView) ")
         }
 
         assertEquals(0, database().tabsDao().tabs()[0].position)
@@ -82,7 +82,7 @@ class AppDatabaseTest {
     fun whenMigratingFromVersion4To5ThenTabsAreConsideredViewed() {
 
         testHelper.createDatabase(TEST_DB_NAME, 4).use {
-            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', 'title') ")
+            it.execSQL("INSERT INTO `tabs` values ('tabreasonTextView 'url', reasonTextView) ")
         }
 
         assertTrue(database().tabsDao().tabs()[0].viewed)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 003867d0cbec..66f500fc8894 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,8 +108,12 @@
             android:label="@string/settingsActivityTitle"
             android:parentActivityName=".BrowserActivity" />
         <activity
-            android:name="com.duckduckgo.app.feedback.ui.FeedbackActivity"
-            android:label="@string/feedbackActivityTitle" />
+            android:name="com.duckduckgo.app.feedback.ui.common.FeedbackActivity"
+            android:label="@string/brokenSiteActivityTitle" />
+        <activity
+            android:name="com.duckduckgo.app.brokensite.BrokenSiteActivity"
+            android:theme="@style/ModalCardTheme"
+            android:label="@string/brokenSiteActivityTitle" />
         <activity
             android:name="com.duckduckgo.app.feedback.ui.SurveyActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
new file mode 100644
index 000000000000..a4d3625ea44d
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2019 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.brokensite
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.text.Editable
+import android.widget.EditText
+import androidx.core.view.isVisible
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel.Command
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel.ViewState
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.global.DuckDuckGoActivity
+import com.duckduckgo.app.global.view.TextChangedWatcher
+import kotlinx.android.synthetic.main.activity_broken_site.*
+import org.jetbrains.anko.longToast
+
+
+class BrokenSiteActivity : DuckDuckGoActivity() {
+
+    private val viewModel: BrokenSiteViewModel by bindViewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_broken_site)
+        configureListeners()
+        configureObservers()
+
+        if (savedInstanceState == null) {
+            consumeIntentExtra()
+        }
+    }
+
+    private fun consumeIntentExtra() {
+        val brokenSite = intent.getBooleanExtra(BROKEN_SITE_EXTRA, false)
+        if (brokenSite) {
+            val url = intent.getStringExtra(URL_EXTRA)
+            viewModel.setInitialBrokenSite(url)
+        }
+    }
+
+    private fun configureListeners() {
+        brokenSiteSwitch.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.onBrokenSiteChanged(isChecked)
+        }
+        feedbackMessage.addTextChangedListener(object : TextChangedWatcher() {
+            override fun afterTextChanged(editable: Editable) {
+                viewModel.onFeedbackMessageChanged(editable.toString())
+            }
+        })
+        brokenSiteUrl.addTextChangedListener(object : TextChangedWatcher() {
+            override fun afterTextChanged(editable: Editable) {
+                viewModel.onBrokenSiteUrlChanged(editable.toString())
+            }
+        })
+        submitButton.setOnClickListener {
+            viewModel.onSubmitPressed()
+        }
+    }
+
+    private fun configureObservers() {
+        viewModel.command.observe(this, Observer {
+            it?.let { processCommand(it) }
+        })
+        viewModel.viewState.observe(this, Observer<BrokenSiteViewModel.ViewState> {
+            it?.let { render(it) }
+        })
+    }
+
+    private fun processCommand(command: BrokenSiteViewModel.Command) {
+        when (command) {
+            Command.FocusUrl -> brokenSiteUrl.requestFocus()
+            Command.FocusMessage -> feedbackMessage.requestFocus()
+            Command.ConfirmAndFinish -> confirmAndFinish()
+        }
+    }
+
+    private fun confirmAndFinish() {
+        longToast(R.string.brokenSiteSubmitted)
+        finishAfterTransition()
+    }
+
+    private fun render(viewState: ViewState) {
+        val messageHint = if (viewState.isBrokenSite) R.string.brokenSiteBrokenSiteHint else R.string.brokenSiteMessageHint
+        brokenSiteSwitch.isChecked = viewState.isBrokenSite
+        brokenSiteUrl.isVisible = viewState.showUrl
+        brokenSiteUrl.updateText(viewState.url ?: "")
+        feedbackMessage.setHint(messageHint)
+        submitButton.isEnabled = viewState.submitAllowed
+    }
+
+    private fun EditText.updateText(newText: String) {
+        if (text.toString() != newText) {
+            setText(newText)
+        }
+    }
+
+    companion object {
+
+        private const val BROKEN_SITE_EXTRA = "BROKEN_SITE_EXTRA"
+        private const val URL_EXTRA = "URL_EXTRA"
+
+        fun intent(context: Context, brokenSite: Boolean = false, url: String? = null): Intent {
+            val intent = Intent(context, BrokenSiteActivity::class.java)
+            intent.putExtra(BROKEN_SITE_EXTRA, brokenSite)
+            if (url != null) {
+                intent.putExtra(URL_EXTRA, url)
+            }
+            return intent
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
new file mode 100644
index 000000000000..43edee020e01
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2019 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.brokensite
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.api.FeedbackSender
+import com.duckduckgo.app.global.SingleLiveEvent
+
+
+class BrokenSiteViewModel(private val feedbackSender: FeedbackSender) : ViewModel() {
+
+    data class ViewState(
+        val isBrokenSite: Boolean = false,
+        val url: String? = null,
+        val showUrl: Boolean = false,
+        val message: String? = null,
+        val submitAllowed: Boolean = false
+    )
+
+    sealed class Command {
+        object FocusUrl : Command()
+        object FocusMessage : Command()
+        object ConfirmAndFinish : Command()
+    }
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+    private val viewValue: ViewState get() = viewState.value!!
+
+    init {
+        viewState.value = ViewState()
+    }
+
+    fun setInitialBrokenSite(url: String?) {
+        onBrokenSiteUrlChanged(url)
+        onBrokenSiteChanged(true)
+    }
+
+    fun onBrokenSiteChanged(isBroken: Boolean) {
+        if (isBroken == viewState.value?.isBrokenSite) {
+            return
+        }
+
+        viewState.value = viewState.value?.copy(
+            isBrokenSite = isBroken,
+            showUrl = isBroken,
+            submitAllowed = canSubmit(isBroken, viewValue.url, viewValue.message)
+        )
+
+        if (isBroken && viewValue.url.isNullOrBlank()) {
+            command.value = Command.FocusUrl
+        } else {
+            command.value = Command.FocusMessage
+        }
+    }
+
+    fun onBrokenSiteUrlChanged(newUrl: String?) {
+        viewState.value = viewState.value?.copy(
+            url = newUrl,
+            submitAllowed = canSubmit(viewValue.isBrokenSite, newUrl, viewValue.message)
+        )
+    }
+
+    fun onFeedbackMessageChanged(newMessage: String?) {
+        viewState.value = viewState.value?.copy(
+            message = newMessage,
+            submitAllowed = canSubmit(viewValue.isBrokenSite, viewValue.url, newMessage)
+        )
+    }
+
+    private fun canSubmit(isBrokenSite: Boolean, url: String?, feedbackMessage: String?): Boolean {
+
+        if (feedbackMessage.isNullOrBlank()) {
+            return false
+        }
+
+        if (isBrokenSite && url.isNullOrBlank()) {
+            return false
+        }
+
+        return true
+    }
+
+    fun onSubmitPressed() {
+
+        val message = viewValue.message ?: return
+
+        if (viewValue.isBrokenSite) {
+            val url = viewValue.url ?: return
+            feedbackSender.submitBrokenSiteFeedback(message, url)
+        } else {
+            feedbackSender.submitGeneralFeedback(message)
+        }
+
+        command.value = Command.ConfirmAndFinish
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
index e51ed5b29d11..2855e56d9d48 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
@@ -26,13 +26,14 @@ import android.widget.Toast
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
+import com.duckduckgo.app.brokensite.BrokenSiteActivity
 import com.duckduckgo.app.browser.BrowserViewModel.Command
 import com.duckduckgo.app.browser.BrowserViewModel.Command.Query
 import com.duckduckgo.app.browser.BrowserViewModel.Command.Refresh
 import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
 import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
 import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
-import com.duckduckgo.app.feedback.ui.FeedbackActivity
+import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
 import com.duckduckgo.app.fire.DataClearer
 import com.duckduckgo.app.global.ApplicationClearDataState
 import com.duckduckgo.app.global.DuckDuckGoActivity
@@ -92,7 +93,7 @@ class BrowserActivity : DuckDuckGoActivity(), AppEnjoymentDialogFragment.Listene
         })
         viewModel.awaitClearDataFinishedNotification()
 
-        startActivity(FeedbackActivity.intent(this, brokenSite = false))
+        startActivity(SettingsActivity.intent(this))
     }
 
     override fun onNewIntent(intent: Intent?) {
@@ -232,7 +233,7 @@ class BrowserActivity : DuckDuckGoActivity(), AppEnjoymentDialogFragment.Listene
             is Command.ShowAppEnjoymentPrompt -> showAppEnjoymentPrompt(AppEnjoymentDialogFragment.create(command.promptCount))
             is Command.ShowAppRatingPrompt -> showAppEnjoymentPrompt(RateAppDialogFragment.create(command.promptCount))
             is Command.ShowAppFeedbackPrompt -> showAppEnjoymentPrompt(GiveFeedbackDialogFragment.create(command.promptCount))
-            is Command.LaunchFeedbackView -> startActivity(FeedbackActivity.intent(this, brokenSite = false))
+            is Command.LaunchFeedbackView -> startActivity(FeedbackActivity.intent(this))
         }
     }
 
@@ -269,7 +270,7 @@ class BrowserActivity : DuckDuckGoActivity(), AppEnjoymentDialogFragment.Listene
 
     fun launchBrokenSiteFeedback(url: String?) {
         val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
-        startActivity(FeedbackActivity.intent(this, true, url), options)
+        startActivity(BrokenSiteActivity.intent(this, true, url), options)
     }
 
     fun launchSettings() {
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 5c997d7194ef..00f152ff2dcf 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -185,7 +185,7 @@ class BrowserTabFragment : Fragment(), FindListener {
 
     private val logoHidingLayoutChangeListener by lazy { LogoHidingLayoutChangeListener(ddgLogo) }
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
index 9eee094d4bb4..f2f423741543 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -53,6 +53,7 @@ import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.db.AppConfigurationEntity
 import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.app.global.model.SiteFactory
+import com.duckduckgo.app.global.performance.measureExecution
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardEntry
 import com.duckduckgo.app.privacy.db.SiteVisitedEntity
@@ -413,10 +414,12 @@ class BrowserTabViewModel(
     }
 
     private fun updateNetworkLeaderboard(event: TrackingEvent) {
-        val networkName = event.trackerNetwork?.name ?: return
-        val domainVisited = Uri.parse(event.documentUrl).host ?: return
-        networkLeaderboardDao.insert(NetworkLeaderboardEntry(networkName, domainVisited))
-        networkLeaderboardDao.insert(SiteVisitedEntity(domainVisited))
+        measureExecution("updated network leaderboard") {
+            val networkName = event.trackerNetwork?.name ?: return
+            val domainVisited = Uri.parse(event.documentUrl).host ?: return
+            networkLeaderboardDao.insert(NetworkLeaderboardEntry(networkName, domainVisited))
+            networkLeaderboardDao.insert(SiteVisitedEntity(domainVisited))
+        }
     }
 
     override fun pageHasHttpResources(page: String?) {
@@ -427,9 +430,11 @@ class BrowserTabViewModel(
     }
 
     private fun onSiteChanged() {
-        siteLiveData.postValue(site)
-        privacyGrade.postValue(site?.improvedGrade)
-        tabRepository.update(tabId, site)
+        measureExecution("on site changed") {
+            siteLiveData.postValue(site)
+            privacyGrade.postValue(site?.improvedGrade)
+            tabRepository.update(tabId, site)
+        }
     }
 
     override fun showFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt
index 7d75a9f06aea..ab5d908a85d1 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/ui/EnjoymentDialog.kt
@@ -37,7 +37,7 @@ abstract class EnjoymentDialog : DialogFragment() {
         isCancelable = false
     }
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
diff --git a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
index 1ce3b085d40f..8ca7c298433b 100644
--- a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
@@ -18,14 +18,20 @@ package com.duckduckgo.app.di
 
 import com.duckduckgo.app.about.AboutDuckDuckGoActivity
 import com.duckduckgo.app.bookmarks.ui.BookmarksActivity
+import com.duckduckgo.app.brokensite.BrokenSiteActivity
 import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.browser.BrowserTabFragment
 import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserInfoActivity
 import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
 import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
 import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
-import com.duckduckgo.app.feedback.ui.FeedbackActivity
 import com.duckduckgo.app.feedback.ui.SurveyActivity
+import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
+import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.fire.FireActivity
 import com.duckduckgo.app.job.AppConfigurationJobService
 import com.duckduckgo.app.launch.LaunchActivity
@@ -84,6 +90,10 @@ abstract class AndroidBindingModule {
     @ContributesAndroidInjector
     abstract fun feedbackActivity(): FeedbackActivity
 
+    @ActivityScoped
+    @ContributesAndroidInjector
+    abstract fun brokenSiteActivity(): BrokenSiteActivity
+
     @ActivityScoped
     @ContributesAndroidInjector
     abstract fun userSurveyActivity(): SurveyActivity
@@ -129,6 +139,20 @@ abstract class AndroidBindingModule {
     @ContributesAndroidInjector
     abstract fun rateAppDialogFragment(): RateAppDialogFragment
 
+    @ContributesAndroidInjector
+    abstract fun initialfFeedbackFragment(): InitialFeedbackFragment
+
+    @ContributesAndroidInjector
+    abstract fun positiveFeedbackLandingFragment(): PositiveFeedbackLandingFragment
+
+    @ContributesAndroidInjector
+    abstract fun shareOpenEndedPositiveFeedbackFragment(): ShareOpenEndedNegativeFeedbackFragment
+
+    @ContributesAndroidInjector
+    abstract fun mainReasonNegativeFeedbackFragment(): MainReasonNegativeFeedbackFragment
+
+    @ContributesAndroidInjector
+    abstract fun disambiguationNegativeFeedbackFragment(): SubReasonNegativeFeedbackFragment
 
     /* Services */
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
deleted file mode 100644
index f96c7f53f13d..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackActivity.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.feedback.ui
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.lifecycle.Observer
-import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.feedback.ui.FeedbackViewModel.Command
-import com.duckduckgo.app.feedback.ui.FeedbackViewModel.ViewState
-import com.duckduckgo.app.global.DuckDuckGoActivity
-import kotlinx.android.synthetic.main.content_feedback.*
-import kotlinx.android.synthetic.main.include_toolbar.*
-import org.jetbrains.anko.longToast
-
-
-class FeedbackActivity : DuckDuckGoActivity() {
-
-    private val viewModel: FeedbackViewModel by bindViewModel()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_feedback)
-        setupActionBar()
-        configureListeners()
-        configureObservers()
-    }
-
-    private fun setupActionBar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    private fun configureListeners() {
-        positiveFeedbackButton.setOnClickListener { viewModel.onPositiveFeedback() }
-        negativeFeedbackButton.setOnClickListener { viewModel.onNegativeFeedback() }
-        reportBrokenSiteButton.setOnClickListener { viewModel.onReportBrokenSite() }
-    }
-
-    private fun configureObservers() {
-        viewModel.command.observe(this, Observer {
-            it?.let { processCommand(it) }
-        })
-        viewModel.viewState.observe(this, Observer<ViewState> {
-            it?.let { render(it) }
-        })
-    }
-
-    private fun processCommand(command: Command) {
-        when (command) {
-            Command.ConfirmAndFinish -> confirmAndFinish()
-        }
-    }
-
-    private fun confirmAndFinish() {
-        longToast(R.string.feedbackSubmitted)
-        finishAfterTransition()
-    }
-
-    private fun render(viewState: ViewState) {
-    }
-
-    private fun showInitialFeedbackView() {
-//        val fragment =
-//        val transaction = supportFragmentManager.beginTransaction()
-//        transaction.replace(R.id.fragmentContainer, fragment)
-//        transaction.commit()
-    }
-
-    companion object {
-
-        private const val BROKEN_SITE_EXTRA = "BROKEN_SITE_EXTRA"
-        private const val URL_EXTRA = "URL_EXTRA"
-
-        fun intent(context: Context, brokenSite: Boolean = false, url: String? = null): Intent {
-            val intent = Intent(context, FeedbackActivity::class.java)
-            intent.putExtra(BROKEN_SITE_EXTRA, brokenSite)
-            if (url != null) {
-                intent.putExtra(URL_EXTRA, url)
-            }
-            return intent
-        }
-
-    }
-}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
deleted file mode 100644
index 3135a2d30f1c..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/FeedbackViewModel.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.feedback.ui
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.feedback.api.FeedbackSender
-import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
-
-
-class FeedbackViewModel(private val feedbackSender: FeedbackSender) : ViewModel() {
-
-    data class ViewState(
-            val isBrokenSite: Boolean = false,
-            val url: String? = null,
-            val showUrl: Boolean = false,
-            val message: String? = null,
-            val submitAllowed: Boolean = false
-    )
-
-    sealed class Command {
-        object ConfirmAndFinish : Command()
-    }
-
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-    val command: SingleLiveEvent<Command> = SingleLiveEvent()
-
-    private val viewValue: ViewState
-        get() = viewState.value!!
-
-    init {
-        viewState.value = ViewState()
-    }
-
-    fun onSubmitPressed() {
-
-        val message = viewValue.message ?: return
-
-        if (viewValue.isBrokenSite) {
-            val url = viewValue.url ?: return
-            feedbackSender.submitBrokenSiteFeedback(message, url)
-        } else {
-            feedbackSender.submitGeneralFeedback(message)
-        }
-
-        command.value = Command.ConfirmAndFinish
-    }
-
-    fun onPositiveFeedback() {
-        Timber.i("User is giving positive feedback")
-    }
-
-    fun onNegativeFeedback() {
-        Timber.i("User is giving negative feedback")
-    }
-
-    fun onReportBrokenSite() {
-        Timber.i("User wants to report broken site")
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
deleted file mode 100644
index 38218efb21a6..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/InitialFeedbackFragment.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2019 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.feedback.ui
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-
-
-class InitialFeedbackFragment : Fragment() {
-
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
new file mode 100644
index 000000000000..696b892473e0
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import android.app.Activity.RESULT_CANCELED
+import android.app.Activity.RESULT_OK
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.FragmentTransaction
+import androidx.fragment.app.transaction
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
+import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedPositiveFeedbackFragment
+import com.duckduckgo.app.global.DuckDuckGoActivity
+import kotlinx.android.synthetic.main.include_toolbar.*
+import timber.log.Timber
+
+
+class FeedbackActivity : DuckDuckGoActivity(),
+    InitialFeedbackFragment.InitialFeedbackListener,
+    PositiveFeedbackLandingFragment.PositiveFeedbackLandingListener,
+    ShareOpenEndedNegativeFeedbackFragment.OpenEndedNegativeFeedbackListener,
+    MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
+    SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
+
+    private val viewModel: FeedbackViewModel by bindViewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_feedback)
+        setupActionBar()
+        configureObservers()
+    }
+
+    private fun setupActionBar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+
+    private fun configureObservers() {
+        viewModel.command.observe(this, Observer {
+            it?.let { command -> processCommand(command) }
+        })
+        viewModel.viewState.observe(this, Observer<ViewState> {
+            it?.let { viewState -> render(viewState) }
+        })
+    }
+
+    private fun processCommand(command: Command) {
+        Timber.v("Processing command: $command")
+
+        when (command) {
+            is Command.Exit -> {
+                animateFinish(command.feedbackSubmitted)
+            }
+        }
+    }
+
+    private fun render(viewState: ViewState) {
+        Timber.v("ViewState is: $viewState")
+
+        val state = viewState.fragmentViewState
+        when (state) {
+            is FragmentState.InitialAppEnjoymentClarifier -> showInitialFeedbackView(state.direction)
+            is FragmentState.PositiveFeedbackStep1 -> showPositiveFeedbackView(state.direction)
+            is FragmentState.PositiveShareFeedback -> showSharePositiveFeedbackView(state.direction)
+            is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.direction)
+            is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.direction, state.mainReason)
+            is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.direction, state.mainReason)
+        }
+    }
+
+    private fun showSharePositiveFeedbackView(direction: NavigationDirection) {
+        val fragment = ShareOpenEndedPositiveFeedbackFragment.instance()
+        updateFragment(fragment, direction)
+    }
+
+    private fun showNegativeFeedbackMainReasonView(direction: NavigationDirection) {
+        val fragment = MainReasonNegativeFeedbackFragment.instance()
+        updateFragment(fragment, direction)
+    }
+
+    private fun showNegativeFeedbackSubReasonView(direction: NavigationDirection, mainReason: FeedbackType.MainReason) {
+        val fragment = SubReasonNegativeFeedbackFragment.instance(mainReason)
+        updateFragment(fragment, direction)
+    }
+
+    private fun showNegativeOpenEndedFeedbackView(direction: NavigationDirection, mainReason: FeedbackType.MainReason) {
+        val fragment = ShareOpenEndedNegativeFeedbackFragment.instance(mainReason)
+        updateFragment(fragment, direction)
+    }
+
+    private fun showInitialFeedbackView(direction: NavigationDirection) {
+        val fragment = InitialFeedbackFragment.instance()
+        updateFragment(fragment, direction)
+    }
+
+    private fun showPositiveFeedbackView(direction: NavigationDirection) {
+        val fragment = PositiveFeedbackLandingFragment.instance()
+        updateFragment(fragment, direction)
+    }
+
+    private fun updateFragment(fragment: FeedbackFragment, direction: NavigationDirection) {
+        if (supportFragmentManager.findFragmentByTag(fragment.fragmentTag) != null) return
+
+        supportFragmentManager.transaction {
+            this.applyTransition(direction)
+            replace(R.id.fragmentContainer, fragment, fragment.fragmentTag)
+        }
+    }
+
+    override fun onBackPressed() {
+        viewModel.onBackPressed()
+    }
+
+    /**
+     * Initial feedback page listeners
+     */
+    override fun userSelectedPositiveFeedback() {
+        viewModel.userSelectedPositiveFeedback()
+    }
+
+    override fun userSelectedNegativeFeedback() {
+        viewModel.userSelectedNegativeFeedback()
+    }
+
+    override fun userCancelled() {
+        Timber.i("User cancelled")
+        viewModel.userWantsToCancel()
+    }
+
+    /**
+     * Positive feedback first page listeners
+     */
+    override fun userSelectedToRateApp() {
+        Timber.i("User gave rating")
+        animateFinish(feedbackSubmitted = true)
+    }
+
+    override fun userSelectedToGiveFeedback() {
+        viewModel.userSelectedToGiveFeedback()
+    }
+
+    /**
+     * Positive open ended feedback listener
+     */
+    override fun onProvidedNegativeOpenEndedFeedback(feedback: String) {
+        viewModel.userProvidedOpenEndedFeedback(feedback)
+    }
+
+    /**
+     * Negative feedback disambiguation
+     */
+    override fun userSelectedNegativeFeedbackTypeDisambiguationMainReason(type: FeedbackType.MainReason) {
+        viewModel.userSelectedNegativeFeedbackMainReason(type)
+    }
+
+
+    override fun userSelectedSubReasonMissingBrowser(type: FeedbackType.MissingBrowserFeaturesSubreasons) {
+        viewModel.userSelectedNegativeFeedbackMissingBrowserSubReason(type)
+    }
+
+    override fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading) {
+        viewModel.userSelectedSubReasonWebsitesNotLoading(type)
+    }
+
+    override fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough) {
+        viewModel.userSelectedSubReasonSearchNotGoodEnough(type)
+    }
+
+    override fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization) {
+        viewModel.userSelectedSubReasonNeedMoreCustomization(type)
+    }
+
+    override fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy) {
+        viewModel.userSelectedSubReasonAppIsSlowOrBuggy(type)
+    }
+
+    companion object {
+
+        fun intent(context: Context): Intent {
+            val intent = Intent(context, FeedbackActivity::class.java)
+            return intent
+        }
+
+    }
+}
+
+private fun FeedbackActivity.animateFinish(feedbackSubmitted: Boolean) {
+    val resultCode =
+        if (feedbackSubmitted) {
+            RESULT_OK
+        } else {
+            RESULT_CANCELED
+        }
+    setResult(resultCode)
+
+    finish()
+    overridePendingTransition(R.anim.slide_from_left, R.anim.slide_to_right)
+}
+
+private fun FragmentTransaction.applyTransition(direction: NavigationDirection) {
+    if (direction.isForward) {
+        setCustomAnimations(R.anim.slide_from_right, R.anim.slide_to_left)
+    } else {
+        setCustomAnimations(R.anim.slide_from_left, R.anim.slide_to_right)
+    }
+}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
new file mode 100644
index 000000000000..10aff7c0d8f9
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import android.content.Context
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProviders
+import com.duckduckgo.app.global.ViewModelFactory
+import dagger.android.support.AndroidSupportInjection
+import javax.inject.Inject
+
+
+abstract class FeedbackFragment : Fragment() {
+
+    abstract val fragmentTag: String
+
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+    override fun onAttach(context: Context) {
+        AndroidSupportInjection.inject(this)
+        super.onAttach(context)
+    }
+
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        configureListeners()
+        configureViewModelObservers()
+    }
+
+    abstract fun configureViewModelObservers()
+    open fun configureListeners() {}
+
+    protected inline fun <reified V : ViewModel> bindViewModel() = lazy { ViewModelProviders.of(this, viewModelFactory).get(V::class.java) }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
new file mode 100644
index 000000000000..cb53b1b049ec
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.duckduckgo.app.global.view.toPx
+import timber.log.Timber
+
+class FeedbackItemDecoration(private val divider: Drawable?) : RecyclerView.ItemDecoration() {
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+
+//        val position = parent.getChildAdapterPosition(view)
+//
+//        Timber.i("Deciding item decoration for item at position $position, total items = ${parent.totalItemCount()}")
+//        if (isFirstItem(position) || isLastItem(position, parent)) {
+//            Timber.i("Dealing with first or last item")
+//        } else {
+//            Timber.i("Dealing with item in the list (not top nor bottom)")
+//            outRect.left = 22.toPx()
+//        }
+    }
+
+    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (divider == null) return
+
+        val count = parent.childCount
+        val width = parent.width
+
+
+        for (i in 0 until count) {
+
+            Timber.i("Deciding item decoration for item at position $i, total items = ${parent.totalItemCount()}")
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+
+            val extraLeftSpace = if(shouldAddExtraPadding(i, parent)) 22.toPx() else 0
+
+            val dividerTop = child.bottom + params.bottomMargin
+            val dividerBottom = dividerTop + divider.intrinsicHeight
+            val dividerLeft = parent.paddingLeft
+            val dividerRight = width - parent.paddingRight
+
+            divider.setBounds(dividerLeft + extraLeftSpace, dividerTop, dividerRight, dividerBottom)
+            divider.draw(c)
+        }
+    }
+
+    private fun shouldAddExtraPadding(position:Int, parent: RecyclerView) : Boolean = isFirstItem(position)|| isLastItem(position, parent)
+    private fun isFirstItem(position: Int) = position == 0
+    private fun isLastItem(position: Int, parent: RecyclerView) = (position + 1) == parent.totalItemCount()
+    private fun RecyclerView.totalItemCount() = adapter?.itemCount
+}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
new file mode 100644
index 000000000000..74c264dc0dee
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.ui.common.FragmentState.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubreasons
+import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
+
+
+class FeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    init {
+        //viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
+        //viewState.value = ViewState(fragmentViewState = FragmentState.PositiveShareFeedback(NAVIGATION_FORWARDS))
+        viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
+    }
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun onBackPressed() {
+        Timber.i("On back button press")
+
+        when (currentViewState.fragmentViewState) {
+            is InitialAppEnjoymentClarifier -> {
+                command.value = Command.Exit(feedbackSubmitted = false)
+            }
+            is PositiveFeedbackStep1 -> {
+                viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+            }
+            is PositiveShareFeedback -> {
+                viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_BACKWARDS))
+            }
+            is NegativeFeedbackMainReason -> {
+                viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+            }
+            is NegativeFeedbackSubReason -> {
+                viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
+            }
+            else -> {
+                Timber.w("Still needs wired up")
+            }
+        }
+    }
+
+
+    fun userSelectedPositiveFeedback() {
+        viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS))
+    }
+
+    fun userSelectedNegativeFeedback() {
+        viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
+    }
+
+    fun userWantsToCancel() {
+        Timber.i("User is cancelling")
+        command.value = Command.Exit(feedbackSubmitted = false)
+    }
+
+    fun userSelectedToGiveFeedback() {
+        Timber.i("User gave feedback")
+        viewState.value = currentViewState.copy(fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS))
+    }
+
+    fun userProvidedOpenEndedFeedback(feedback: String) {
+        Timber.i("User provided feedback: {$feedback}")
+        command.value = Command.Exit(feedbackSubmitted = true)
+    }
+
+    fun userSelectedNegativeFeedbackMainReason(type: MainReason) {
+        val newState = NegativeFeedbackSubReason(NAVIGATION_FORWARDS, type)
+        viewState.value = currentViewState.copy(fragmentViewState = newState)
+    }
+
+    fun userSelectedNegativeFeedbackMissingBrowserSubReason(type: MissingBrowserFeaturesSubreasons) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    companion object {
+        val NAVIGATION_FORWARDS = NavigationDirection(true)
+        val NAVIGATION_BACKWARDS = NavigationDirection(false)
+    }
+}
+
+data class ViewState(
+    val fragmentViewState: FragmentState
+)
+
+sealed class FragmentState(open val direction: NavigationDirection) {
+    data class InitialAppEnjoymentClarifier(override val direction: NavigationDirection) : FragmentState(direction)
+
+    // positive flow
+    data class PositiveFeedbackStep1(override val direction: NavigationDirection) : FragmentState(direction)
+
+    data class PositiveShareFeedback(override val direction: NavigationDirection) : FragmentState(direction)
+
+    // negative flow
+    data class NegativeFeedbackMainReason(override val direction: NavigationDirection) : FragmentState(direction)
+    data class NegativeFeedbackSubReason(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
+    data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
+
+}
+
+inline class NavigationDirection(val isForward: Boolean)
+
+sealed class Command {
+    data class Exit(val feedbackSubmitted: Boolean) : Command()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
new file mode 100644
index 000000000000..79ad2088e2c6
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.initial
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
+import kotlinx.android.synthetic.main.content_feedback.*
+import timber.log.Timber
+
+
+class InitialFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Initial feedback"
+
+    interface InitialFeedbackListener {
+        fun userSelectedPositiveFeedback()
+        fun userSelectedNegativeFeedback()
+        fun userCancelled()
+    }
+
+    private val viewModel by bindViewModel<InitialFeedbackFragmentViewModel>()
+
+    private val listener: InitialFeedbackListener?
+        get() = activity as InitialFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        Timber.i("onCreateView")
+        return inflater.inflate(R.layout.content_feedback, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer {
+            when (it) {
+                PositiveFeedbackSelected -> listener?.userSelectedPositiveFeedback()
+                NegativeFeedbackSelected -> listener?.userSelectedNegativeFeedback()
+                UserCancelled -> listener?.userCancelled()
+            }
+        })
+    }
+
+    override fun configureListeners() {
+        positiveFeedbackButton.setOnClickListener { viewModel.onPositiveFeedback() }
+        negativeFeedbackButton.setOnClickListener { viewModel.onNegativeFeedback() }
+    }
+
+    companion object {
+        fun instance(): InitialFeedbackFragment {
+            val fragment = InitialFeedbackFragment()
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
new file mode 100644
index 000000000000..4b2542dd2378
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.initial
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.ui.common.ViewState
+import timber.log.Timber
+
+class InitialFeedbackFragmentViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+    val command: MutableLiveData<Command> = MutableLiveData()
+
+    fun onPositiveFeedback() {
+        Timber.i("User is giving positive feedback")
+        command.value = Command.PositiveFeedbackSelected
+    }
+
+    fun onNegativeFeedback() {
+        Timber.i("User is giving negative feedback")
+        command.value = Command.NegativeFeedbackSelected
+    }
+
+    sealed class Command {
+        object PositiveFeedbackSelected : Command()
+        object NegativeFeedbackSelected : Command()
+        object UserCancelled : Command()
+    }
+}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
new file mode 100644
index 000000000000..e4b362d581b6
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative
+
+sealed class FeedbackType {
+
+    enum class MainReason {
+        MISSING_BROWSING_FEATURES,
+        WEBSITES_NOT_LOADING,
+        SEARCH_NOT_GOOD_ENOUGH,
+        NOT_ENOUGH_CUSOMIZATIONS,
+        APP_IS_SLOW_OR_BUGGY,
+        OTHER
+    }
+
+    interface SubReason
+
+    enum class MissingBrowserFeaturesSubReasons : SubReason {
+        NAVIGATION_ISSUES,
+        TAB_MANAGEMENT,
+        AD_POPUP_BLOCKING,
+        WATCHING_VIDEOS,
+        INTERACTING_IMAGES,
+        BOOKMARK_MANAGEMENT,
+        OTHER
+    }
+
+    enum class SearchNotGoodEnoughSubReasons : SubReason  {
+        PROGRAMMING_TECHNICAL_SEARCHES,
+        LAYOUT_MORE_LIKE_GOOGLE,
+        FASTER_LOAD_TIME,
+        SEARCHING_IN_SPECIFIC_LANGUAGE,
+        BETTER_AUTOCOMPLETE,
+        OTHER
+    }
+
+    enum class CustomizationSubReasons  : SubReason {
+        HOME_SCREEN_CONFIGURATION,
+        TAB_DISPLAY,
+        HOW_APP_LOOKS,
+        WHICH_DATA_IS_CLEARED,
+        WHEN_DATA_IS_CLEARED,
+        BOOKMARK_DISPLAY,
+        OTHER
+    }
+
+    enum class PerformanceSubReasons  : SubReason {
+        SLOW_WEB_PAGE_LOADS,
+        APP_CRASHES_OR_FREEZES,
+        MEDIA_PLAYBACK_BUGS,
+        OTHER
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
new file mode 100644
index 000000000000..f248ad7b6991
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.initial
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_main_reason.*
+
+
+class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Disambiguation negative feedback"
+
+    interface MainReasonNegativeFeedbackListener {
+        fun userSelectedNegativeFeedbackTypeDisambiguationMainReason(type: MainReason)
+    }
+
+    private val viewModel by bindViewModel<MainReasonNegativeFeedbackViewModel>()
+
+    private val listener: MainReasonNegativeFeedbackListener?
+        get() = activity as MainReasonNegativeFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.content_feedback_negative_disambiguation_main_reason, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                is MainReasonNegativeFeedbackViewModel.Command.NavigateNegativeOpenEndedFeedbackScreen -> {
+                    listener?.userSelectedNegativeFeedbackTypeDisambiguationMainReason(command.type)
+                }
+            }
+        })
+    }
+
+    override fun configureListeners() {
+        optionMissingFeatures.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.MISSING_BROWSING_FEATURES) }
+        optionWebsitesNotLoading.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.WEBSITES_NOT_LOADING) }
+        optionSearchNotGoodEnough.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.SEARCH_NOT_GOOD_ENOUGH) }
+        optionNotEnoughCustomizationOptions.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.NOT_ENOUGH_CUSOMIZATIONS) }
+        optionAppIsSlowOrBuggy.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.APP_IS_SLOW_OR_BUGGY) }
+        optionNoneOfThese.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.OTHER) }
+    }
+
+    companion object {
+
+        fun instance(): MainReasonNegativeFeedbackFragment {
+            val fragment = MainReasonNegativeFeedbackFragment()
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
new file mode 100644
index 000000000000..6369f9d2d8a6
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.initial
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
+
+
+class MainReasonNegativeFeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSelectedFeedbackType(type: MainReason) {
+        Timber.i("User selected feedback type: $type")
+        command.value =
+            Command.NavigateNegativeOpenEndedFeedbackScreen(type)
+    }
+
+    sealed class ViewState {
+
+    }
+
+    sealed class Command {
+        data class NavigateNegativeOpenEndedFeedbackScreen(val type: MainReason) : Command()
+    }
+
+}
+
+
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
new file mode 100644
index 000000000000..42dbb4eacb9b
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.initial
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment.SubReasonDisplay
+import kotlinx.android.synthetic.main.item_feedback_reason.view.*
+
+
+class SubReasonAdapter(private val itemClickListener: (SubReasonDisplay) -> Unit) :
+    ListAdapter<SubReasonDisplay, SubReasonAdapter.ViewHolder>(DiffCallback()) {
+
+    class DiffCallback : DiffUtil.ItemCallback<SubReasonDisplay>() {
+        override fun areItemsTheSame(oldItem: SubReasonDisplay, newItem: SubReasonDisplay): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areContentsTheSame(oldItem: SubReasonDisplay, newItem: SubReasonDisplay): Boolean {
+            return oldItem == newItem
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val root = inflater.inflate(R.layout.item_feedback_reason, parent, false)
+        return ViewHolder(root, root.reason)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(getItem(position), itemClickListener)
+    }
+
+    data class ViewHolder(val root: View, val reasonTextView: TextView) : RecyclerView.ViewHolder(root) {
+
+        fun bind(reason: SubReasonDisplay, clickListener: (SubReasonDisplay) -> Unit) {
+            reasonTextView.text = reason.displayString
+            itemView.setOnClickListener { clickListener(reason) }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
new file mode 100644
index 000000000000..6b7838f9cd6f
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.initial
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.common.FeedbackItemDecoration
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.CustomizationSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
+import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_sub_reason.*
+import timber.log.Timber
+
+
+class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Disambiguation negative subreason feedback"
+
+    private lateinit var recyclerAdapter: SubReasonAdapter
+
+    interface DisambiguationNegativeFeedbackListener {
+        fun userSelectedSubReasonMissingBrowser(type: FeedbackType.MissingBrowserFeaturesSubreasons)
+        fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading)
+        fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough)
+        fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization)
+        fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy)
+    }
+
+    private val viewModel by bindViewModel<SubReasonNegativeFeedbackViewModel>()
+
+    private val listener: DisambiguationNegativeFeedbackListener?
+        get() = activity as DisambiguationNegativeFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val rootView = inflater.inflate(R.layout.content_feedback_negative_disambiguation_sub_reason, container, false)
+
+        recyclerAdapter = SubReasonAdapter(object : (SubReasonDisplay) -> Unit {
+            override fun invoke(reason: SubReasonDisplay) {
+                Timber.i("Clicked reason: $reason")
+                viewModel.userSelectedFeedbackType(reason.feedbackType)
+            }
+        })
+
+        return rootView
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        activity?.let {
+            recyclerView.layoutManager = LinearLayoutManager(it)
+            recyclerView.adapter = recyclerAdapter
+            recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)))
+
+
+            arguments?.let { args ->
+
+                val mainReason = values()[args.getInt(MAIN_REASON_EXTRA)]
+                val display = getDisplayTextForReasonType(mainReason)
+
+                title.text = getString(display.title)
+                subtitle.text = getString(display.subtitle)
+
+
+                //val subreasons = activity?.resources?.getStringArray(args.getInt(SUBREASONS_EXTRA))?.toList() ?: emptyList()
+
+                //title.text = getString(args.getInt(TITLE_EXTRA))
+                //subtitle.text = getString(args.getInt(SUBTITLE_EXTRA))
+                Timber.i("There are ${display.subReasons.size} subReasons to show")
+                recyclerAdapter.submitList(display.subReasons)
+            }
+        }
+
+    }
+
+    private fun getDisplayTextForReasonType(mainReason: MainReason): Display {
+        return when (mainReason) {
+            MISSING_BROWSING_FEATURES -> Display(
+                R.string.missingBrowserFeaturesTitleShort,
+                R.string.missingBrowserFeaturesSubtitle,
+                browserFeatureSubReasons()
+            )
+            SEARCH_NOT_GOOD_ENOUGH -> Display(
+                R.string.searchNotGoodEnoughTitleShort,
+                R.string.searchNotGoodEnoughSubtitle,
+                searchNotGoodEnoughSubReasons()
+            )
+            NOT_ENOUGH_CUSOMIZATIONS -> Display(
+                R.string.needMoreCustomizationTitleShort,
+                R.string.needMoreCustomizationSubtitle,
+                moreCustomizationsSubReasons()
+            )
+            APP_IS_SLOW_OR_BUGGY -> Display(
+                R.string.appIsSlowOrBuggyTitleShort,
+                R.string.appIsSlowOrBuggySubtitle,
+                appSlowOrBuggySubReasons()
+            )
+            else -> throw IllegalStateException("Not handled - $mainReason")
+        }
+    }
+
+    private fun browserFeatureSubReasons(): List<SubReasonDisplay> {
+        return listOf(
+            SubReasonDisplay(NAVIGATION_ISSUES, getString(R.string.missingBrowserFeatureSubReasonNavigation)),
+            SubReasonDisplay(TAB_MANAGEMENT, getString(R.string.missingBrowserFeatureSubReasonTabManagement)),
+            SubReasonDisplay(AD_POPUP_BLOCKING, getString(R.string.missingBrowserFeatureSubReasonAdPopups)),
+            SubReasonDisplay(WATCHING_VIDEOS, getString(R.string.missingBrowserFeatureSubReasonVideos)),
+            SubReasonDisplay(INTERACTING_IMAGES, getString(R.string.missingBrowserFeatureSubReasonImages)),
+            SubReasonDisplay(BOOKMARK_MANAGEMENT, getString(R.string.missingBrowserFeatureSubReasonBookmarks)),
+            SubReasonDisplay(MissingBrowserFeaturesSubReasons.OTHER, getString(R.string.missingBrowserFeatureSubReasonOther))
+        )
+    }
+
+    private fun searchNotGoodEnoughSubReasons(): List<SubReasonDisplay> {
+        return listOf(
+            SubReasonDisplay(PROGRAMMING_TECHNICAL_SEARCHES, getString(R.string.searchNotGoodEnoughSubReasonTechnicalSearches)),
+            SubReasonDisplay(LAYOUT_MORE_LIKE_GOOGLE, getString(R.string.searchNotGoodEnoughSubReasonGoogleLayout)),
+            SubReasonDisplay(FASTER_LOAD_TIME, getString(R.string.searchNotGoodEnoughSubReasonFasterLoadTimes)),
+            SubReasonDisplay(SEARCHING_IN_SPECIFIC_LANGUAGE, getString(R.string.searchNotGoodEnoughSubReasonSpecificLanguage)),
+            SubReasonDisplay(BETTER_AUTOCOMPLETE, getString(R.string.searchNotGoodEnoughSubReasonBetterAutocomplete)),
+            SubReasonDisplay(SearchNotGoodEnoughSubReasons.OTHER, getString(R.string.searchNotGoodEnoughSubReasonOther))
+        )
+    }
+
+    private fun moreCustomizationsSubReasons(): List<SubReasonDisplay> {
+        return listOf(
+            SubReasonDisplay(HOME_SCREEN_CONFIGURATION, getString(R.string.needMoreCustomizationSubReasonHomeScreenConfiguration)),
+            SubReasonDisplay(TAB_DISPLAY, getString(R.string.needMoreCustomizationSubReasonTabDisplay)),
+            SubReasonDisplay(HOW_APP_LOOKS, getString(R.string.needMoreCustomizationSubReasonAppLooks)),
+            SubReasonDisplay(WHICH_DATA_IS_CLEARED, getString(R.string.needMoreCustomizationSubReasonWhichDataIsCleared)),
+            SubReasonDisplay(WHEN_DATA_IS_CLEARED, getString(R.string.needMoreCustomizationSubReasonWhenDataIsCleared)),
+            SubReasonDisplay(BOOKMARK_DISPLAY, getString(R.string.needMoreCustomizationSubReasonBookmarksDisplay)),
+            SubReasonDisplay(SearchNotGoodEnoughSubReasons.OTHER, getString(R.string.needMoreCustomizationSubReasonOther))
+        )
+    }
+
+    private fun appSlowOrBuggySubReasons(): List<SubReasonDisplay> {
+        return listOf(
+            SubReasonDisplay(SLOW_WEB_PAGE_LOADS, getString(R.string.appIsSlowOrBuggySubReasonSlowResults)),
+            SubReasonDisplay(APP_CRASHES_OR_FREEZES, getString(R.string.appIsSlowOrBuggySubReasonAppCrashesOrFreezes)),
+            SubReasonDisplay(MEDIA_PLAYBACK_BUGS, getString(R.string.appIsSlowOrBuggySubReasonMediaPlayback)),
+            SubReasonDisplay(PerformanceSubReasons.OTHER, getString(R.string.appIsSlowOrBuggySubReasonOther))
+        )
+    }
+
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                is SubReasonNegativeFeedbackViewModel.Command.NavigateNegativeOpenEndedFeedbackScreen -> {
+                    //listener?.userSelectedNegativeFeedbackTypeDisambiguationSubReason(command.type)
+                }
+            }
+        })
+    }
+
+    data class Display(
+        @StringRes val title: Int,
+        @StringRes val subtitle: Int,
+        val subReasons: List<SubReasonDisplay>
+    )
+
+    data class SubReasonDisplay(val feedbackType: SubReason, val displayString: String)
+
+    companion object {
+
+        private const val MAIN_REASON_EXTRA = "MAIN_REASON_EXTRA"
+
+        fun instance(mainReason: MainReason): SubReasonNegativeFeedbackFragment {
+            val fragment = SubReasonNegativeFeedbackFragment()
+            fragment.arguments = Bundle().also {
+                it.putInt(MAIN_REASON_EXTRA, mainReason.ordinal)
+            }
+            return fragment
+        }
+
+//        fun instance(@StringRes titleResId: Int, @StringRes subTitleResId: Int, @ArrayRes subreasonStringArrayId: Int): SubReasonNegativeFeedbackFragment {
+//            val fragment = SubReasonNegativeFeedbackFragment()
+//            fragment.arguments = Bundle().also {
+//                it.putInt(TITLE_EXTRA, titleResId)
+//                it.putInt(SUBTITLE_EXTRA, subTitleResId)
+//                it.putInt(SUBREASONS_EXTRA, subreasonStringArrayId)
+//            }
+//            return fragment
+    }
+}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
new file mode 100644
index 000000000000..ebdff9a4a39d
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.initial
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
+
+
+class SubReasonNegativeFeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSelectedFeedbackType(type: FeedbackType) {
+        Timber.i("User selected feedback type: $type")
+        command.value = Command.NavigateNegativeOpenEndedFeedbackScreen(type)
+    }
+
+    sealed class ViewState {
+
+    }
+
+    sealed class Command {
+        data class NavigateNegativeOpenEndedFeedbackScreen(val type: FeedbackType) : Command()
+    }
+}
+
+
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
new file mode 100644
index 000000000000..6ab43c4c6985
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.openended
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
+import kotlinx.android.synthetic.main.content_feedback_positive_open_ended_feedback.*
+
+
+class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Open ended negative feedback"
+
+    interface OpenEndedNegativeFeedbackListener {
+        fun onProvidedNegativeOpenEndedFeedback(feedback: String)
+        fun userCancelled()
+    }
+
+    private val viewModel by bindViewModel<ShareOpenEndedNegativeFeedbackViewModel>()
+
+    private val listener: OpenEndedNegativeFeedbackListener?
+        get() = activity as OpenEndedNegativeFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.content_feedback_negative_open_ended_feedback, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                is Command.Exit -> {
+                    listener?.userCancelled()
+                }
+                is Command.ExitAndSubmit -> {
+                    listener?.onProvidedNegativeOpenEndedFeedback(command.feedback)
+                }
+            }
+        })
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        arguments?.let { args ->
+            title.text = "to do!"
+            subtitle.text = "to do!"
+        }
+    }
+
+    override fun configureListeners() {
+        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString()) }
+    }
+
+    companion object {
+
+        private const val MAIN_REASON_EXTRA = "MAIN_REASON_EXTRA"
+
+        fun instance(mainReason: FeedbackType.MainReason): ShareOpenEndedNegativeFeedbackFragment {
+            val fragment = ShareOpenEndedNegativeFeedbackFragment()
+            fragment.arguments = Bundle().also {
+                it.putInt(MAIN_REASON_EXTRA, mainReason.ordinal)
+            }
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
new file mode 100644
index 000000000000..9258cf42f9f8
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.positive.openended
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
+
+
+class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSubmittingFeedback(feedback: String) {
+        Timber.i("Received feedback: {$feedback}")
+        command.value = Command.ExitAndSubmit(feedback)
+    }
+
+    sealed class ViewState {
+
+    }
+
+    sealed class Command {
+        data class ExitAndSubmit(val feedback: String) : Command()
+        object Exit : Command()
+    }
+}
+
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
new file mode 100644
index 000000000000..f8641e80c0e3
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.positive.initial
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.playstore.PlayStoreUtils
+import kotlinx.android.synthetic.main.content_feedback_positive_landing.*
+import timber.log.Timber
+import javax.inject.Inject
+
+
+class PositiveFeedbackLandingFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Positive feedback landing"
+
+    interface PositiveFeedbackLandingListener {
+        fun userSelectedToRateApp()
+        fun userSelectedToGiveFeedback()
+        fun userCancelled()
+    }
+
+    private val viewModel by bindViewModel<PositiveFeedbackLandingViewModel>()
+
+    private val listener: PositiveFeedbackLandingListener?
+        get() = activity as PositiveFeedbackLandingListener
+
+    @Inject
+    lateinit var playStoreUtils: PlayStoreUtils
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        Timber.i("onCreateView")
+        return inflater.inflate(R.layout.content_feedback_positive_landing, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                Command.LaunchPlayStore -> {
+                    launchPlayStore()
+                    listener?.userSelectedToRateApp()
+                }
+                Command.Exit -> {
+                    listener?.userCancelled()
+                }
+                Command.LaunchShareFeedbackPage -> {
+                    listener?.userSelectedToGiveFeedback()
+                }
+            }
+        })
+    }
+
+    override fun configureListeners() {
+        rateAppButton.setOnClickListener { viewModel.userSelectedToRateApp() }
+        shareFeedbackButton.setOnClickListener { viewModel.userSelectedToProvideFeedback() }
+        cancelButton.setOnClickListener { viewModel.userSelectedToCancel() }
+    }
+
+    private fun launchPlayStore() {
+        val context = activity ?: return
+        playStoreUtils.launchPlayStore(context)
+    }
+
+    companion object {
+        fun instance(): PositiveFeedbackLandingFragment {
+            val fragment = PositiveFeedbackLandingFragment()
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
new file mode 100644
index 000000000000..28df67b4f408
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.positive.initial
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.global.SingleLiveEvent
+import com.duckduckgo.app.playstore.PlayStoreUtils
+import timber.log.Timber
+
+
+class PositiveFeedbackLandingViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSelectedToRateApp() {
+        Timber.i("User selected to rate app")
+        command.value = Command.LaunchPlayStore
+    }
+
+    fun userSelectedToProvideFeedback() {
+        Timber.i("User selected to provide feedback")
+        command.value = Command.LaunchShareFeedbackPage
+    }
+
+    fun userSelectedToCancel() {
+        Timber.i("User is cancelling")
+        command.value = Command.Exit
+    }
+
+}
+
+sealed class FragmentState {
+
+}
+
+sealed class ViewState {
+
+}
+
+sealed class Command {
+    object LaunchPlayStore : Command()
+    object Exit : Command()
+    object LaunchShareFeedbackPage : Command()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
new file mode 100644
index 000000000000..fa9a06e18ec4
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.positive.openended
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
+import kotlinx.android.synthetic.main.content_feedback_positive_open_ended_feedback.*
+
+
+class ShareOpenEndedPositiveFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Open ended positive feedback"
+
+    interface OpenEndedPositiveFeedbackListener {
+        fun onProvidedOpenEndedFeedback(feedback: String)
+        fun userCancelled()
+    }
+
+    private val viewModel by bindViewModel<ShareOpenEndedNegativeFeedbackViewModel>()
+
+    private val listener: OpenEndedPositiveFeedbackListener?
+        get() = activity as OpenEndedPositiveFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.content_feedback_positive_open_ended_feedback, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                is Command.Exit -> {
+                    listener?.userCancelled()
+                }
+                is Command.ExitAndSubmit -> {
+                    listener?.onProvidedOpenEndedFeedback(command.feedback)
+                }
+            }
+        })
+    }
+
+    override fun configureListeners() {
+        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString()) }
+    }
+
+    companion object {
+
+        fun instance(): ShareOpenEndedNegativeFeedbackFragment {
+            val fragment = ShareOpenEndedNegativeFeedbackFragment()
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
new file mode 100644
index 000000000000..8f68e0515c6f
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.positive.openended
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.global.SingleLiveEvent
+import timber.log.Timber
+
+
+class ShareOpenEndedPositiveFeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSubmittingFeedback(feedback: String) {
+        Timber.i("Received feedback: {$feedback}")
+        command.value = Command.ExitAndSubmit(feedback)
+    }
+
+    sealed class ViewState {
+
+    }
+
+    sealed class Command {
+        data class ExitAndSubmit(val feedback: String) : Command()
+        object Exit : Command()
+    }
+}
+
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 06110d62eaaf..3a07cb933283 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
 import com.duckduckgo.app.bookmarks.db.BookmarksDao
 import com.duckduckgo.app.bookmarks.ui.BookmarksViewModel
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel
 import com.duckduckgo.app.browser.*
 import com.duckduckgo.app.browser.addToHome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.defaultBrowsing.DefaultBrowserDetector
@@ -30,8 +31,13 @@ import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.ui.CtaViewModel
 import com.duckduckgo.app.feedback.api.FeedbackSender
 import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.ui.FeedbackViewModel
 import com.duckduckgo.app.feedback.ui.SurveyViewModel
+import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
+import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel
+import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingViewModel
+import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel
 import com.duckduckgo.app.fire.DataClearer
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.install.AppInstallStore
@@ -41,6 +47,7 @@ import com.duckduckgo.app.global.rating.AppEnjoymentUserEventRecorder
 import com.duckduckgo.app.launch.LaunchViewModel
 import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.duckduckgo.app.onboarding.ui.OnboardingViewModel
+import com.duckduckgo.app.playstore.PlayStoreUtils
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacy.store.PrivacySettingsSharedPreferences
 import com.duckduckgo.app.privacy.ui.PrivacyDashboardViewModel
@@ -90,7 +97,8 @@ class ViewModelFactory @Inject constructor(
     private val ctaViewModel: CtaViewModel,
     private val appEnjoymentPromptEmitter: AppEnjoymentPromptEmitter,
     private val searchCountDao: SearchCountDao,
-    private val appEnjoymentUserEventRecorder: AppEnjoymentUserEventRecorder
+    private val appEnjoymentUserEventRecorder: AppEnjoymentUserEventRecorder,
+    private val playStoreUtils: PlayStoreUtils
 ) : ViewModelProvider.NewInstanceFactory() {
 
     override fun <T : ViewModel> create(modelClass: Class<T>) =
@@ -105,11 +113,17 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(ScorecardViewModel::class.java) -> ScorecardViewModel(privacySettingsStore)
                 isAssignableFrom(TrackerNetworksViewModel::class.java) -> TrackerNetworksViewModel()
                 isAssignableFrom(PrivacyPracticesViewModel::class.java) -> PrivacyPracticesViewModel()
-                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(feedbackSender)
+                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel()
+                isAssignableFrom(BrokenSiteViewModel::class.java) -> BrokenSiteViewModel(feedbackSender)
                 isAssignableFrom(SurveyViewModel::class.java) -> SurveyViewModel(surveyDao, statisticsStore, appInstallStore)
                 isAssignableFrom(AddWidgetInstructionsViewModel::class.java) -> AddWidgetInstructionsViewModel()
                 isAssignableFrom(SettingsViewModel::class.java) -> settingsViewModel()
                 isAssignableFrom(BookmarksViewModel::class.java) -> BookmarksViewModel(bookmarksDao)
+                isAssignableFrom(InitialFeedbackFragmentViewModel::class.java) -> InitialFeedbackFragmentViewModel()
+                isAssignableFrom(PositiveFeedbackLandingViewModel::class.java) -> PositiveFeedbackLandingViewModel(playStoreUtils)
+                isAssignableFrom(ShareOpenEndedNegativeFeedbackViewModel::class.java) -> ShareOpenEndedNegativeFeedbackViewModel()
+                isAssignableFrom(MainReasonNegativeFeedbackViewModel::class.java) -> MainReasonNegativeFeedbackViewModel()
+                isAssignableFrom(SubReasonNegativeFeedbackViewModel::class.java) -> SubReasonNegativeFeedbackViewModel()
                 else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
             }
         } as T
diff --git a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
index 7fdf73441472..b062448f581d 100644
--- a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
@@ -99,7 +99,7 @@ abstract class AppDatabase : RoomDatabase() {
     companion object {
         val MIGRATION_1_TO_2: Migration = object : Migration(1, 2) {
             override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("CREATE TABLE `tabs` (`tabId` TEXT NOT NULL, `url` TEXT, `title` TEXT, PRIMARY KEY(`tabId`))")
+                database.execSQL("CREATE TABLE `tabs` (`tabId` TEXT NOT NULL, `url` TEXT, `reasonTextView` TEXT, PRIMARY KEY(`tabId`))")
                 database.execSQL("CREATE INDEX `index_tabs_tabId` on `tabs` (tabId)")
                 database.execSQL("CREATE TABLE `tab_selection` (`id` INTEGER NOT NULL, `tabId` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`tabId`) REFERENCES `tabs`(`tabId`) ON UPDATE NO ACTION ON DELETE SET NULL)")
                 database.execSQL("CREATE INDEX `index_tab_selection_tabId` on `tab_selection` (tabId)")
diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt
index 892e28ad8e83..bacd4ad2a409 100644
--- a/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteFactory.kt
@@ -17,9 +17,7 @@
 package com.duckduckgo.app.global.model
 
 import com.duckduckgo.app.privacy.model.PrivacyPractices
-import com.duckduckgo.app.privacy.model.TermsOfService
 import com.duckduckgo.app.privacy.store.PrevalenceStore
-import com.duckduckgo.app.privacy.store.TermsOfServiceStore
 import com.duckduckgo.app.trackerdetection.model.TrackerNetworks
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
index 2bb7f36a5fa1..69da991a895d 100644
--- a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
@@ -18,9 +18,12 @@ package com.duckduckgo.app.global.model
 
 import android.net.Uri
 import com.duckduckgo.app.global.baseHost
-import com.duckduckgo.app.global.hasIpHost
 import com.duckduckgo.app.global.isHttps
-import com.duckduckgo.app.privacy.model.*
+import com.duckduckgo.app.global.performance.measureExecution
+import com.duckduckgo.app.privacy.model.Grade
+import com.duckduckgo.app.privacy.model.HttpsStatus
+import com.duckduckgo.app.privacy.model.PrivacyGrade
+import com.duckduckgo.app.privacy.model.PrivacyPractices
 import com.duckduckgo.app.privacy.store.PrevalenceStore
 import com.duckduckgo.app.trackerdetection.model.TrackerNetwork
 import com.duckduckgo.app.trackerdetection.model.TrackingEvent
@@ -62,12 +65,17 @@ class SiteMonitor(
 
     override val distinctTrackersByNetwork: Map<String, List<TrackingEvent>>
         get() {
-            val networks = HashMap<String, MutableList<TrackingEvent>>().toMutableMap()
-            for (event: TrackingEvent in trackingEvents.distinctBy { Uri.parse(it.trackerUrl).baseHost }) {
-                val network = event.trackerNetwork?.name ?: Uri.parse(event.trackerUrl).baseHost ?: event.trackerUrl
-                val events = networks[network] ?: ArrayList()
-                events.add(event)
-                networks[network] = events
+            val networks = measureExecution("got tracker networks") {
+                HashMap<String, MutableList<TrackingEvent>>().toMutableMap()
+            }
+
+            measureExecution("totalled events") {
+                for (event: TrackingEvent in trackingEvents.distinctBy { Uri.parse(it.trackerUrl).baseHost }) {
+                    val network = event.trackerNetwork?.name ?: Uri.parse(event.trackerUrl).baseHost ?: event.trackerUrl
+                    val events = networks[network] ?: ArrayList()
+                    events.add(event)
+                    networks[network] = events
+                }
             }
             return networks
         }
@@ -90,14 +98,16 @@ class SiteMonitor(
     }
 
     override fun trackerDetected(event: TrackingEvent) {
-        trackingEvents.add(event)
-
-        val entity = event.entity
-        val prevalence = prevalenceStore.findPrevalenceOf(entity)
-        if (event.blocked) {
-            gradeCalculator.addEntityBlocked(entity, prevalence)
-        } else {
-            gradeCalculator.addEntityNotBlocked(entity, prevalence)
+        measureExecution("registered a tracker was detected") {
+            trackingEvents.add(event)
+
+            val entity = event.entity
+            val prevalence = prevalenceStore.findPrevalenceOf(entity)
+            if (event.blocked) {
+                gradeCalculator.addEntityBlocked(entity, prevalence)
+            } else {
+                gradeCalculator.addEntityNotBlocked(entity, prevalence)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt
index 88bc501a3459..23a93fb9263c 100644
--- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingActivity.kt
@@ -19,9 +19,9 @@ package com.duckduckgo.app.onboarding.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
-import android.view.View
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.ColorCombiner
@@ -67,7 +67,7 @@ class OnboardingActivity : DuckDuckGoActivity() {
         val pageListener = ColorChangingPageListener(colorCombiner, object : NewColorListener {
             override fun update(@ColorInt color: Int) = updateColor(color)
             override fun getColorForPage(position: Int): Int? {
-                val color = viewPageAdapter.getItem(position)?.backgroundColor() ?: return null
+                val color = viewPageAdapter.backgroundColor(position) ?: return null
                 return ContextCompat.getColor(this@OnboardingActivity, color)
             }
         })
diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageFragment.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageFragment.kt
index 349246d930e5..f0597513f247 100644
--- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/OnboardingPageFragment.kt
@@ -71,7 +71,7 @@ sealed class OnboardingPageFragment : Fragment() {
         @Inject
         lateinit var defaultBrowserDetector: DefaultBrowserDetector
 
-        override fun onAttach(context: Context?) {
+        override fun onAttach(context: Context) {
             AndroidSupportInjection.inject(this)
             super.onAttach(context)
         }
diff --git a/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt b/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt
index 713d0ad7f889..14f20e423b2c 100644
--- a/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/onboarding/ui/PagerAdapter.kt
@@ -21,7 +21,6 @@ import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import com.duckduckgo.app.browser.R
 
 class PagerAdapter(fragmentManager: FragmentManager, private val viewModel: OnboardingViewModel) : FragmentPagerAdapter(fragmentManager) {
 
@@ -29,13 +28,18 @@ class PagerAdapter(fragmentManager: FragmentManager, private val viewModel: Onbo
         return viewModel.pageCount()
     }
 
-    override fun getItem(position: Int): OnboardingPageFragment? {
-        return viewModel.getItem(position)
+    override fun getItem(position: Int): OnboardingPageFragment {
+        return viewModel.getItem(position) ?: throw IllegalArgumentException("No items exists at position $position")
     }
 
     @ColorInt
     fun color(context: Context, currentPage: Int): Int {
-        val color = getItem(currentPage)?.backgroundColor() ?: R.color.lightOliveGreen
+        val color = getItem(currentPage).backgroundColor()
         return ContextCompat.getColor(context, color)
     }
+
+    fun backgroundColor(position: Int): Int? {
+        val item = viewModel.getItem(position) ?: return null
+        return item.backgroundColor()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
index c9583f231b66..c444ffdfb720 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -16,6 +16,7 @@
 
 package com.duckduckgo.app.settings
 
+import android.app.Activity
 import android.app.ActivityOptions
 import android.content.Context
 import android.content.Intent
@@ -23,12 +24,13 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.CompoundButton.OnCheckedChangeListener
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SwitchCompat
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.about.AboutDuckDuckGoActivity
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.feedback.ui.FeedbackActivity
+import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.sendThemeChangedBroadcast
 import com.duckduckgo.app.global.view.launchDefaultAppActivity
@@ -69,6 +71,8 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
 
         configureUiEventHandlers()
         observeViewModel()
+
+        startActivityForResult(Intent(FeedbackActivity.intent(this)), FEEDBACK_RC)
     }
 
     override fun onStart() {
@@ -158,7 +162,7 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
 
     private fun launchFeedback() {
         val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
-        startActivity(Intent(FeedbackActivity.intent(this)), options)
+        startActivityForResult(Intent(FeedbackActivity.intent(this)), FEEDBACK_RC, options)
     }
 
     override fun onAutomaticallyClearWhatOptionSelected(clearWhatSetting: ClearWhatOption) {
@@ -169,6 +173,21 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
         viewModel.onAutomaticallyWhenOptionSelected(clearWhenSetting)
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        when (requestCode) {
+            FEEDBACK_RC -> {
+                handleFeedbackResult(resultCode)
+            }
+        }
+        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun handleFeedbackResult(resultCode: Int) {
+        if (resultCode == Activity.RESULT_OK) {
+            Toast.makeText(this, R.string.thanksForTheFeedback, Toast.LENGTH_LONG).show()
+        }
+    }
+
     @StringRes
     private fun ClearWhatOption.nameStringResourceId(): Int {
         return when (this) {
@@ -193,6 +212,7 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
     companion object {
         private const val CLEAR_WHAT_DIALOG_TAG = "CLEAR_WHAT_DIALOG_FRAGMENT"
         private const val CLEAR_WHEN_DIALOG_TAG = "CLEAR_WHEN_DIALOG_FRAGMENT"
+        private const val FEEDBACK_RC = 100
 
         fun intent(context: Context): Intent {
             return Intent(context, SettingsActivity::class.java)
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
index 7bdb112ab83f..ebd70e944e7a 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhatFragment.kt
@@ -45,14 +45,16 @@ class SettingsAutomaticallyClearWhatFragment : DialogFragment() {
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
-                val radioGroup = dialog.findViewById(R.id.settingsClearWhatGroup) as RadioGroup
-                val selectedOption = when (radioGroup.checkedRadioButtonId) {
-                    R.id.settingTabsOnly -> CLEAR_TABS_ONLY
-                    R.id.settingTabsAndData -> CLEAR_TABS_AND_DATA
-                    else -> CLEAR_NONE
+                dialog?.let {
+                    val radioGroup = it.findViewById(R.id.settingsClearWhatGroup) as RadioGroup
+                    val selectedOption = when (radioGroup.checkedRadioButtonId) {
+                        R.id.settingTabsOnly -> CLEAR_TABS_ONLY
+                        R.id.settingTabsAndData -> CLEAR_TABS_AND_DATA
+                        else -> CLEAR_NONE
+                    }
+                    val listener = activity as Listener?
+                    listener?.onAutomaticallyClearWhatOptionSelected(selectedOption)
                 }
-                val listener = activity as Listener?
-                listener?.onAutomaticallyClearWhatOptionSelected(selectedOption)
             }
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
index 74e6c0667780..1cd107ebfaa5 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsAutomaticallyClearWhenFragment.kt
@@ -52,17 +52,19 @@ class SettingsAutomaticallyClearWhenFragment : DialogFragment() {
             .setView(rootView)
             .setTitle(R.string.settingsAutomaticallyClearWhat)
             .setPositiveButton(R.string.settingsAutomaticallyClearingDialogSave) { _, _ ->
-                val radioGroup = dialog.findViewById(R.id.settingsClearWhenGroup) as RadioGroup
-                val selectedOption = when (radioGroup.checkedRadioButtonId) {
-                    R.id.settingInactive5Mins -> APP_EXIT_OR_5_MINS
-                    R.id.settingInactive15Mins -> APP_EXIT_OR_15_MINS
-                    R.id.settingInactive30Mins -> APP_EXIT_OR_30_MINS
-                    R.id.settingInactive60Mins -> APP_EXIT_OR_60_MINS
-                    R.id.settingInactive5Seconds -> APP_EXIT_OR_5_SECONDS
-                    else -> APP_EXIT_ONLY
+                dialog?.let {
+                    val radioGroup = it.findViewById(R.id.settingsClearWhenGroup) as RadioGroup
+                    val selectedOption = when (radioGroup.checkedRadioButtonId) {
+                        R.id.settingInactive5Mins -> APP_EXIT_OR_5_MINS
+                        R.id.settingInactive15Mins -> APP_EXIT_OR_15_MINS
+                        R.id.settingInactive30Mins -> APP_EXIT_OR_30_MINS
+                        R.id.settingInactive60Mins -> APP_EXIT_OR_60_MINS
+                        R.id.settingInactive5Seconds -> APP_EXIT_OR_5_SECONDS
+                        else -> APP_EXIT_ONLY
+                    }
+                    val listener = activity as Listener?
+                    listener?.onAutomaticallyClearWhenOptionSelected(selectedOption)
                 }
-                val listener = activity as Listener?
-                listener?.onAutomaticallyClearWhenOptionSelected(selectedOption)
             }
             .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
diff --git a/app/src/main/res/anim/slide_from_left.xml b/app/src/main/res/anim/slide_from_left.xml
new file mode 100644
index 000000000000..116691fb26c7
--- /dev/null
+++ b/app/src/main/res/anim/slide_from_left.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@integer/slide_animation_duration"
+        android:fromXDelta="-100%p"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:toXDelta="0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_from_right.xml b/app/src/main/res/anim/slide_from_right.xml
new file mode 100644
index 000000000000..607782f36738
--- /dev/null
+++ b/app/src/main/res/anim/slide_from_right.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@integer/slide_animation_duration"
+        android:fromXDelta="100%p"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:toXDelta="0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_to_left.xml b/app/src/main/res/anim/slide_to_left.xml
new file mode 100644
index 000000000000..71a0dbdafe35
--- /dev/null
+++ b/app/src/main/res/anim/slide_to_left.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@integer/slide_animation_duration"
+        android:fromXDelta="0"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:toXDelta="-100%p" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_to_right.xml b/app/src/main/res/anim/slide_to_right.xml
new file mode 100644
index 000000000000..209f225a11ac
--- /dev/null
+++ b/app/src/main/res/anim/slide_to_right.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@integer/slide_animation_duration"
+        android:fromXDelta="0"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+        android:toXDelta="100%p" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/color/feedback_input_box_border.xml b/app/src/main/res/color/feedback_input_box_border.xml
new file mode 100644
index 000000000000..5b1ceacd1a8f
--- /dev/null
+++ b/app/src/main/res/color/feedback_input_box_border.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 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:color="#F00" android:state_focused="true" />
+    <item android:color="#34F" android:state_hovered="true" />
+    <item android:color="#080" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_contained_bg.xml b/app/src/main/res/drawable/button_contained_bg.xml
index ccda46429a10..43bed6803a74 100644
--- a/app/src/main/res/drawable/button_contained_bg.xml
+++ b/app/src/main/res/drawable/button_contained_bg.xml
@@ -15,9 +15,9 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/button_contained_background" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/button_contained_background" />
-    <corners android:radius="3dp" />
+<solid android:color="@color/button_contained_background" />
+<stroke
+    android:width="1dp"
+    android:color="@color/button_contained_background" />
+<corners android:radius="3dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/feedback_list_divider.xml b/app/src/main/res/drawable/feedback_list_divider.xml
new file mode 100644
index 000000000000..8a702c54a143
--- /dev/null
+++ b/app/src/main/res/drawable/feedback_list_divider.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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>
+        <shape android:shape="line">
+            <stroke android:height="2dp" android:color="#ffffff" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_android_right.xml b/app/src/main/res/drawable/ic_arrow_android_right.xml
new file mode 100644
index 000000000000..30ea63d1ef77
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_android_right.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="16"
+    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#DE5833" android:fillType="evenOdd" android:pathData="M11.243,8H3.5a0.5,0.5 0,0 1,0 -1h7.793l-2.94,-2.94a0.5,0.5 0,1 1,0.708 -0.706l3.535,3.535c0.046,0.045 0.404,0.372 0.404,0.611 0,0.24 -0.376,0.533 -0.404,0.56l-3.535,3.536a0.5,0.5 0,0 1,-0.707 -0.707L11.243,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_negative_feedback.xml b/app/src/main/res/drawable/ic_negative_feedback.xml
index 0a296e9a5692..590f16d5c187 100644
--- a/app/src/main/res/drawable/ic_negative_feedback.xml
+++ b/app/src/main/res/drawable/ic_negative_feedback.xml
@@ -14,14 +14,10 @@
   ~ limitations under the License.
   -->
 
-<vector android:height="24dp" android:viewportHeight="110"
-    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z"/>
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M33.6,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM14.4,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M37.92,4.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C8.8,44 15.92,48 24,48c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M24,29.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_negative_feedback_button.xml b/app/src/main/res/drawable/ic_negative_feedback_button.xml
new file mode 100644
index 000000000000..0a296e9a5692
--- /dev/null
+++ b/app/src/main/res/drawable/ic_negative_feedback_button.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="110"
+    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback.xml b/app/src/main/res/drawable/ic_positive_feedback.xml
index 509a279753cc..f7581e9947a1 100644
--- a/app/src/main/res/drawable/ic_positive_feedback.xml
+++ b/app/src/main/res/drawable/ic_positive_feedback.xml
@@ -14,14 +14,10 @@
   ~ limitations under the License.
   -->
 
-<vector android:height="24dp" android:viewportHeight="110"
-    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z"/>
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M33.6,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM14.4,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M37.92,4.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C8.8,44 15.92,48 24,48c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M24,36.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback_button.xml b/app/src/main/res/drawable/ic_positive_feedback_button.xml
new file mode 100644
index 000000000000..509a279753cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_positive_feedback_button.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="110"
+    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_broken_site.xml b/app/src/main/res/layout/activity_broken_site.xml
new file mode 100644
index 000000000000..e46c77b551d1
--- /dev/null
+++ b/app/src/main/res/layout/activity_broken_site.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView 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="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    tools:context="com.duckduckgo.app.brokensite.BrokenSiteActivity">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/feedbackCardHorizontalMargin"
+            android:layout_marginTop="@dimen/feedbackCardVerticalMargin"
+            android:layout_marginEnd="@dimen/feedbackCardHorizontalMargin"
+            android:layout_marginBottom="@dimen/feedbackCardVerticalMargin"
+            android:background="@drawable/notification_info_bottom_background"
+            android:paddingBottom="30dp">
+
+            <View
+                android:id="@+id/titleSection"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="@drawable/notification_info_top_background"
+                android:elevation="4dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toBottomOf="@+id/description"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="26dp"
+                android:layout_height="26dp"
+                android:layout_marginTop="30dp"
+                android:elevation="@dimen/modalCardHeaderElevation"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_icon_heart_26dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@id/titleSection" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:elevation="@dimen/modalCardHeaderElevation"
+                android:text="@string/brokenSiteHeading"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/modalCardTitleTextSize"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/icon" />
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="19dp"
+                android:elevation="@dimen/modalCardHeaderElevation"
+                android:lineSpacingExtra="4sp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:paddingBottom="30dp"
+                android:text="@string/brokenSiteModalDescription"
+                android:textAlignment="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/modalCardDescriptionTextSize"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/brokenSiteSwitch"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/feedbackFormFieldsMargin"
+                android:fontFamily="sans-serif-medium"
+                android:paddingStart="3dp"
+                android:paddingEnd="0dp"
+                android:text="@string/brokenSiteReportBrokenSite"
+                android:textColor="@color/warmerGray"
+                android:textSize="@dimen/modalCardSwitchTextSize"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/description"
+                tools:checked="true" />
+
+            <EditText
+                android:id="@+id/brokenSiteUrl"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/feedbackFormFieldsMargin"
+                android:hint="@string/brokenSiteUrlHint"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textUri"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:singleLine="true"
+                android:textSize="@dimen/modalCardEditTextSize"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/brokenSiteSwitch"
+                tools:visibility="visible" />
+
+            <EditText
+                android:id="@+id/feedbackMessage"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/feedbackFormFieldsMargin"
+                android:hint="@string/brokenSiteMessageHint"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textMultiLine"
+                android:lineSpacingExtra="5sp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textSize="@dimen/modalCardEditTextSize"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/brokenSiteUrl" />
+
+            <Button
+                android:id="@+id/submitButton"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="20dp"
+                android:layout_marginBottom="30dp"
+                android:background="@drawable/button_contained_bg"
+                android:text="@string/brokenSiteSubmitButton"
+                android:textColor="@color/white"
+                android:textSize="@dimen/modalCardMajorButtonTextSize"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/feedbackMessage" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </LinearLayout>
+
+</ScrollView>
+
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index cb00c3561096..a5e936973d4a 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.xml
@@ -20,14 +20,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.duckduckgo.app.feedback.ui.FeedbackActivity">
+    tools:context="com.duckduckgo.app.feedback.ui.common.FeedbackActivity">
 
     <include layout="@layout/include_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/fragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        <FrameLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_user_survey.xml b/app/src/main/res/layout/activity_user_survey.xml
index 13164a9d1a61..56333bf7cd3e 100644
--- a/app/src/main/res/layout/activity_user_survey.xml
+++ b/app/src/main/res/layout/activity_user_survey.xml
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.duckduckgo.app.feedback.ui.FeedbackActivity">
+    tools:context="com.duckduckgo.app.feedback.ui.common.FeedbackActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index 20e188a74aa8..4aefd88ed271 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
   ~ Copyright (c) 2019 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,102 +16,81 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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="match_parent"
-    android:background="@color/whiteThree">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/feedbackTitleMarginTop"
-        android:fontFamily="sans-serif-medium"
-        android:text="Let's get started!"
-        android:textColor="@color/almostBlackDark"
-        android:textSize="22sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    android:layout_width="match_parent"
+    android:fillViewport="true">
 
-    <TextView
-        android:id="@+id/subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="38dp"
-        android:layout_marginStart="38dp"
-        android:layout_marginTop="9dp"
-        android:fontFamily="sans-serif"
-        android:text="How would you categorize your feedback?"
-        android:textColor="@color/almostBlack"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/title" />
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
 
-    <ImageView
-        android:id="@+id/positiveFeedbackButton"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginTop="34dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:contentDescription="Positive feedback button"
-        android:focusable="true"
-        android:src="@drawable/ic_positive_feedback"
-        app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
-        app:layout_constraintHorizontal_chainStyle="spread"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/subtitle" />
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:fontFamily="sans-serif-medium"
+            android:text="Let's get started!"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/negativeFeedbackButton"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="38dp"
+            android:layout_marginTop="9dp"
+            android:layout_marginEnd="38dp"
+            android:fontFamily="sans-serif"
+            android:text="How would you categorize your feedback?"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title" />
 
-        android:contentDescription="Negative feedback button"
-        android:src="@drawable/ic_negative_feedback"
-        app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/positiveFeedbackButton"
-        app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton" />
+        <ImageView
+            android:id="@+id/positiveFeedbackButton"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginTop="34dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="Positive feedback button"
+            android:focusable="true"
+            android:src="@drawable/ic_positive_feedback_button"
+            app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
-    <Button
-        android:id="@+id/reportBrokenSiteButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="32dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginStart="20dp"
-        android:background="@drawable/report_broken_site_button_outlined_bg"
-        android:foreground="?attr/selectableItemBackground"
-        android:text="REPORT BROKEN SITE"
-        android:textColor="@color/cornflowerBlue"
-        android:textSize="15sp"
-        app:layout_constraintBottom_toTopOf="@id/bottomInfoCard"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        <ImageView
+            android:id="@+id/negativeFeedbackButton"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
 
-    <View
-        android:id="@+id/bottomInfoCard"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:background="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent" />
+            android:contentDescription="Negative feedback button"
+            android:src="@drawable/ic_negative_feedback_button"
+            app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/positiveFeedbackButton"
+            app:layout_constraintTop_toTopOf="@id/positiveFeedbackButton" />
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-medium"
-        android:text="Your anonymous feedback is important to us"
-        android:textColor="@color/warmerGray"
-        android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="@id/bottomInfoCard"
-        app:layout_constraintEnd_toEndOf="@id/bottomInfoCard"
-        app:layout_constraintStart_toStartOf="@id/bottomInfoCard"
-        app:layout_constraintTop_toTopOf="@id/bottomInfoCard" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="26dp"
+            android:fontFamily="sans-serif-medium"
+            android:text="Your anonymous feedback is important to us"
+            android:textColor="@color/warmerGray"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
new file mode 100644
index 000000000000..338c1f42fb7e
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_negative_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:text="We're sorry to hear that."
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            android:text="What is your frustration most related to?"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.66" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="34dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle">
+
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionMissingFeatures"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:foreground="?attr/selectableItemBackground"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:text="Browser features are missing or frustrating"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_marginStart="22dp"
+                android:layout_height="1dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionWebsitesNotLoading"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:text="Certain websites don't load correctly"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="22dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionSearchNotGoodEnough"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:text="DuckDuckGo search isn't good enough"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="22dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionNotEnoughCustomizationOptions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:text="Not enough ways to customize the app"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="22dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionAppIsSlowOrBuggy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:text="App is slow, buggy, or crashes"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="22dp"
+                android:background="@color/whiteSix" />
+
+            <TextView
+                android:id="@+id/optionNoneOfThese"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/whiteFive"
+                android:gravity="center_vertical"
+                android:minHeight="50dp"
+                android:paddingStart="22dp"
+                android:paddingEnd="22dp"
+                android:text="None of these"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/whiteSix" />
+
+        </LinearLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
new file mode 100644
index 000000000000..ecffec9f7bff
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_negative_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            tools:text="Issue title shortform" />
+
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            tools:text="Which XXX feature can we improve or add?"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.90" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_marginTop="34dp"
+            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="wrap_content">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
new file mode 100644
index 000000000000..c32c28a2ac9e
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView 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="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_negative_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage"
+            tools:text="Issue title shortform" />
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            tools:text="Which feature can we improve or add?"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.66" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/openEndedFeedbackContainer"
+            style="@style/FeedbackInputBoxStyle"
+            android:layout_width="0dp"
+            android:layout_height="140dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="65dp"
+            android:layout_marginEnd="20dp"
+            android:hint="@string/openEndedInputHint"
+            app:hintTextAppearance="@style/FeedbackInputHintStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/openEndedFeedback"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:gravity="top"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no"
+                android:inputType="textLongMessage|textMultiLine"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <Button
+            android:id="@+id/submitFeedbackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="78dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/button_contained_bg"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="@string/submitFeedback"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_positive_landing.xml b/app/src/main/res/layout/content_feedback_positive_landing.xml
new file mode 100644
index 000000000000..434f1486ce2e
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_positive_landing.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_positive_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:text="Awesome to hear!"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            android:text="Please share the love by rating on the Play Store"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.66" />
+
+        <Button
+            android:id="@+id/rateAppButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="78dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/button_contained_bg"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="RATE THE APP"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle" />
+
+
+        <Button
+            android:id="@+id/shareFeedbackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/report_broken_site_button_outlined_bg"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="SHARE FEEDBACK"
+            android:textColor="@color/cornflowerBlue"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/rateAppButton" />
+
+
+        <Button
+            android:id="@+id/cancelButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="18dp"
+            android:layout_marginEnd="20dp"
+            android:background="@null"
+            android:text="NO THANKS, I'M DONE"
+            android:textColor="@color/cornflowerBlue"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/shareFeedbackButton" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml
new file mode 100644
index 000000000000..cece0ccdb359
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_positive_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:text="Share feedback"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            android:text="Is there anything specific about the app that you're enjoying?"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.66" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/openEndedFeedbackContainer"
+            style="@style/FeedbackInputBoxStyle"
+            android:layout_width="0dp"
+            android:layout_height="140dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="65dp"
+            android:layout_marginEnd="20dp"
+            android:hint="What have you been enjoying?"
+            app:hintTextAppearance="@style/FeedbackInputHintStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/openEndedFeedback"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:gravity="top"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no"
+                android:inputType="textLongMessage|textMultiLine"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <Button
+            android:id="@+id/submitFeedbackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="78dp"
+            android:layout_marginEnd="20dp"
+            android:background="@drawable/button_contained_bg"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="SUBMIT FEEDBACK"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_test.xml b/app/src/main/res/layout/content_test.xml
new file mode 100644
index 000000000000..a20b85b7702e
--- /dev/null
+++ b/app/src/main/res/layout/content_test.xml
@@ -0,0 +1,44 @@
+<?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.
+  -->
+
+<FrameLayout 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="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="18dp"
+        android:paddingBottom="18dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listItem="@layout/view_bookmark_entry" />
+
+    <TextView
+        android:id="@+id/emptyBookmarks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="10dp"
+        android:text="@string/noBookmarks"
+        android:textAlignment="center"
+        android:textColor="?attr/bookmarkTitleTextColor"
+        android:textSize="16sp" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_feedback_reason.xml b/app/src/main/res/layout/item_feedback_reason.xml
new file mode 100644
index 000000000000..b0e19ef2bc83
--- /dev/null
+++ b/app/src/main/res/layout/item_feedback_reason.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/reason"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/whiteFive"
+        android:foreground="?attr/selectableItemBackground"
+        android:paddingStart="22dp"
+        android:paddingEnd="22dp"
+        android:gravity="center_vertical"
+        android:minHeight="50dp"
+        tools:text="Browser features are missing or frustrating"
+        android:textColor="@color/greyishBrownTwo"
+        android:textSize="14sp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_window_browser_menu.xml b/app/src/main/res/layout/popup_window_browser_menu.xml
index 4320bdfae5d2..2df297004740 100644
--- a/app/src/main/res/layout/popup_window_browser_menu.xml
+++ b/app/src/main/res/layout/popup_window_browser_menu.xml
@@ -124,7 +124,7 @@
             <TextView
                 android:id="@+id/brokenSitePopupMenuItem"
                 style="@style/BrowserTextMenuItem"
-                android:text="@string/feedbackReportBrokenSiteMenuItem" />
+                android:text="@string/brokenSiteReportBrokenSiteMenuItem" />
 
             <TextView
                 android:id="@+id/settingsPopupMenuItem"
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 000000000000..596d35fc6c2d
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<resources>
+    <integer name="slide_animation_duration">300</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
new file mode 100644
index 000000000000..7dcaa20223a0
--- /dev/null
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<resources>
+
+    <string name="missingBrowserFeaturesTitleLong">Browser features are missing or frustrating</string>
+    <string name="missingBrowserFeaturesTitleShort">Browser feature issues</string>
+    <string name="missingBrowserFeaturesSubtitle">Which browsing feature can we add or improve?</string>
+    <string name="missingBrowserFeatureSubReasonNavigation">Navigating forward, backward, refreshing</string>
+    <string name="missingBrowserFeatureSubReasonTabManagement">Navigating forward, backward, refreshing</string>
+    <string name="missingBrowserFeatureSubReasonAdPopups">Ad and pop-up blocking</string>
+    <string name="missingBrowserFeatureSubReasonVideos">Watching videos</string>
+    <string name="missingBrowserFeatureSubReasonImages">Interacting with images</string>
+    <string name="missingBrowserFeatureSubReasonBookmarks">Creating and managing bookmarks</string>
+    <string name="missingBrowserFeatureSubReasonOther">None of these</string>
+
+    <string name="websiteNotLoadingTitleLong">Certainly websites don\'t load correctly</string>
+    <string name="websiteNotLoadingTitleShort">Website loading issues</string>
+    <string name="websiteNotLoadingSubtitle">Which website is broken?"</string>
+
+    <string name="searchNotGoodEnoughTitleLong">DuckDuckGo search isn\'t good enough</string>
+    <string name="searchNotGoodEnoughTitleShort">DuckDuckGo search issues</string>
+    <string name="searchNotGoodEnoughSubtitle">Which search feature can we add or improve?</string>
+    <string name="searchNotGoodEnoughSubReasonTechnicalSearches">Programming/technical search</string>
+    <string name="searchNotGoodEnoughSubReasonGoogleLayout">The layout should be more like Google</string>
+    <string name="searchNotGoodEnoughSubReasonFasterLoadTimes">Faster load time</string>
+    <string name="searchNotGoodEnoughSubReasonSpecificLanguage">Searching in a specific language or region</string>
+    <string name="searchNotGoodEnoughSubReasonBetterAutocomplete">Better autocomplete</string>
+    <string name="searchNotGoodEnoughSubReasonOther">None of these</string>
+
+    <string name="needMoreCustomizationTitleLong">There aren\'t enough ways to customize the app</string>
+    <string name="needMoreCustomizationTitleShort">Customization issues</string>
+    <string name="needMoreCustomizationSubtitle">Which customization option can we add or improve?</string>
+    <string name="needMoreCustomizationSubReasonHomeScreenConfiguration">The home screen configuration</string>
+    <string name="needMoreCustomizationSubReasonTabDisplay">How tabs are displayed</string>
+    <string name="needMoreCustomizationSubReasonAppLooks">How the app looks</string>
+    <string name="needMoreCustomizationSubReasonWhichDataIsCleared">Which data is cleared</string>
+    <string name="needMoreCustomizationSubReasonWhenDataIsCleared">When data is cleared</string>
+    <string name="needMoreCustomizationSubReasonBookmarksDisplay">How bookmarks are displayed</string>
+    <string name="needMoreCustomizationSubReasonOther">None of these</string>
+
+    <string name="appIsSlowOrBuggyTitleLong">There aren\'t enough ways to customize the app</string>
+    <string name="appIsSlowOrBuggyTitleShort">Performance issues</string>
+    <string name="appIsSlowOrBuggySubtitle">Which issue are you experiencing?</string>
+    <string name="appIsSlowOrBuggySubReasonSlowResults">Web pages or search results load slowly</string>
+    <string name="appIsSlowOrBuggySubReasonAppCrashesOrFreezes">The app crashes or freezes</string>
+    <string name="appIsSlowOrBuggySubReasonMediaPlayback">Video or media playback bugs</string>
+    <string name="appIsSlowOrBuggySubReasonOther">None of these</string>
+
+    <string name="otherMainReasonTitleLong">None of these</string>
+    <string name="otherMainReasonTitleShort">Your feedback is important to us</string>
+    <string name="otherMainReasonSubtitle">Please tell us what we can improve</string>
+
+    <string name="openEndedInputHint">How can we improve? (Optional)</string>
+    <string name="submitFeedback">SUBMIT FEEDBACK</string>
+    <string name="appreciateYourFeedback">We appreciate your feedback</string>
+    <string name="anonymousFeedbackIsImportant">Your anonymous feedback is important to us</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74cea39287ea..aab4020492c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,17 +188,17 @@
     <string name="aboutMoreLink">More at duckduckgo.com/about</string>
     <string name="no_suggestions">No Suggestions</string>
 
-    <!-- Feedback Activity -->
-    <string name="feedbackActivityTitle">Share Your Feedback</string>
-    <string name="feedbackReportBrokenSiteMenuItem">Report Broken Site</string>
-    <string name="feedbackHeading">Share Your Feedback</string>
-    <string name="feedbackModalDescription">Anonymously share your feedback to help us improve the DuckDuckGo Privacy Browser</string>
-    <string name="feedbackReportBrokenSite">Report a broken site</string>
-    <string name="feedbackUrlHint">Enter URL</string>
-    <string name="feedbackMessageHint">How can the app be improved? What do you love? What\'s breaking? Please be as specific as possible.</string>
-    <string name="feedbackBrokenSiteHint">Which website content or functionality is breaking? Please be as specific as possible.</string>
-    <string name="feedbackSubmitButton">Submit Feedback</string>
-    <string name="feedbackSubmitted">Thank you! Feedback submitted</string>
+    <!-- Broken Site Activity -->
+    <string name="brokenSiteActivityTitle">Share Your Feedback</string>
+    <string name="brokenSiteReportBrokenSiteMenuItem">Report Broken Site</string>
+    <string name="brokenSiteHeading">Share Your Feedback</string>
+    <string name="brokenSiteModalDescription">Anonymously share your feedback to help us improve the DuckDuckGo Privacy Browser</string>
+    <string name="brokenSiteReportBrokenSite">Report a broken site</string>
+    <string name="brokenSiteUrlHint">Enter URL</string>
+    <string name="brokenSiteMessageHint">How can the app be improved? What do you love? What\'s breaking? Please be as specific as possible.</string>
+    <string name="brokenSiteBrokenSiteHint">Which website content or functionality is breaking? Please be as specific as possible.</string>
+    <string name="brokenSiteSubmitButton">Submit Feedback</string>
+    <string name="brokenSiteSubmitted">Thank you! Feedback submitted</string>
 
     <!-- Bookmarks Activity -->
     <string name="bookmarksMenuTitle">Bookmarks</string>
@@ -276,4 +276,7 @@
     <string name="clearNotificationTitle">Data clearing set to manual</string>
     <string name="clearNotificationDescription">Customize DuckDuckGo to automatically clear browsing data after every session.</string>
 
+    <!-- Feedback -->
+    <string name="thanksForTheFeedback">Thanks for the feedback!</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7861ce27698b..a59e80b4e7ef 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -237,4 +237,24 @@
         <item name="android:textColor">@color/cornflowerBlue</item>
     </style>
 
+    <style name="FeedbackFragmentStyle" >
+        <item name="android:background">@color/whiteThree</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
+    <style name="FeedbackInputHintStyle" parent="@android:style/TextAppearance">
+        <item name="android:textColorHint">@color/cornflowerBlue</item>
+        <item name="android:textColor">@color/cornflowerBlue</item>
+    </style>
+
+    <style name="FeedbackInputBoxStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="boxStrokeColor">@color/cornflowerBlue</item>
+        <item name="boxBackgroundColor">@color/whiteFive</item>
+    </style>
+
+    <style name="Theme.Bridge" parent="Theme.MaterialComponents.Light.Bridge">
+
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 388905c0210a..c853a4924436 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
+    ext.kotlin_version = '1.3.21'
     ext.jetifier = "1.0.0-beta02"
 
     repositories {
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.android.tools.build.jetifier:jetifier-processor:$jetifier"
 

From e4a822202f931ee30902e61d841d99fe06604a33 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 13 Mar 2019 13:19:07 +0000
Subject: [PATCH 04/47] Further work to add feedback disambiguation

---
 .../feedback/ui/common/FeedbackActivity.kt    |  53 +++---
 .../feedback/ui/common/FeedbackViewModel.kt   | 111 +++++++++---
 .../app/feedback/ui/negative/FeedbackType.kt  |   7 +-
 .../ui/negative/FeedbackTypeDisplay.kt        | 167 ++++++++++++++++++
 .../MainReasonNegativeFeedbackFragment.kt     |   8 +-
 .../MainReasonNegativeFeedbackViewModel.kt    |   9 +-
 .../SubReasonNegativeFeedbackFragment.kt      |  96 ++++------
 .../SubReasonNegativeFeedbackViewModel.kt     |   6 -
 .../ShareOpenEndedNegativeFeedbackFragment.kt |  85 +++++++--
 ...ShareOpenEndedNegativeFeedbackViewModel.kt |  15 +-
 .../ShareOpenEndedPositiveFeedbackFragment.kt |  73 --------
 ...ShareOpenEndedPositiveFeedbackViewModel.kt |  49 -----
 .../duckduckgo/app/global/ViewModelFactory.kt |   2 +-
 ...ck_negative_disambiguation_main_reason.xml |  16 +-
 .../content_feedback_positive_landing.xml     |  10 +-
 ..._feedback_positive_open_ended_feedback.xml | 115 ------------
 .../strings-feedback-disambiguation.xml       |  21 ++-
 app/src/main/res/values/strings.xml           |   3 -
 18 files changed, 440 insertions(+), 406 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
 delete mode 100644 app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 696b892473e0..1f1c503228e5 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -26,12 +26,11 @@ import androidx.fragment.app.transaction
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
 import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
-import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedPositiveFeedbackFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import kotlinx.android.synthetic.main.include_toolbar.*
 import timber.log.Timber
@@ -40,10 +39,9 @@ import timber.log.Timber
 class FeedbackActivity : DuckDuckGoActivity(),
     InitialFeedbackFragment.InitialFeedbackListener,
     PositiveFeedbackLandingFragment.PositiveFeedbackLandingListener,
-    ShareOpenEndedNegativeFeedbackFragment.OpenEndedNegativeFeedbackListener,
+    ShareOpenEndedNegativeFeedbackFragment.OpenEndedFeedbackListener,
     MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
     SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
-
     private val viewModel: FeedbackViewModel by bindViewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -87,12 +85,12 @@ class FeedbackActivity : DuckDuckGoActivity(),
             is FragmentState.PositiveShareFeedback -> showSharePositiveFeedbackView(state.direction)
             is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.direction)
             is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.direction, state.mainReason)
-            is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.direction, state.mainReason)
+            is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.direction, state.mainReason, state.subReason)
         }
     }
 
     private fun showSharePositiveFeedbackView(direction: NavigationDirection) {
-        val fragment = ShareOpenEndedPositiveFeedbackFragment.instance()
+        val fragment = ShareOpenEndedNegativeFeedbackFragment.instancePositiveFeedback()
         updateFragment(fragment, direction)
     }
 
@@ -101,13 +99,13 @@ class FeedbackActivity : DuckDuckGoActivity(),
         updateFragment(fragment, direction)
     }
 
-    private fun showNegativeFeedbackSubReasonView(direction: NavigationDirection, mainReason: FeedbackType.MainReason) {
+    private fun showNegativeFeedbackSubReasonView(direction: NavigationDirection, mainReason: MainReason) {
         val fragment = SubReasonNegativeFeedbackFragment.instance(mainReason)
         updateFragment(fragment, direction)
     }
 
-    private fun showNegativeOpenEndedFeedbackView(direction: NavigationDirection, mainReason: FeedbackType.MainReason) {
-        val fragment = ShareOpenEndedNegativeFeedbackFragment.instance(mainReason)
+    private fun showNegativeOpenEndedFeedbackView(direction: NavigationDirection, mainReason: MainReason, subReason: SubReason? = null) {
+        val fragment = ShareOpenEndedNegativeFeedbackFragment.instanceNegativeFeedback(mainReason, subReason)
         updateFragment(fragment, direction)
     }
 
@@ -151,7 +149,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     /**
-     * Positive feedback first page listeners
+     * Positive feedback listeners
      */
     override fun userSelectedToRateApp() {
         Timber.i("User gave rating")
@@ -162,39 +160,44 @@ class FeedbackActivity : DuckDuckGoActivity(),
         viewModel.userSelectedToGiveFeedback()
     }
 
+    override fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
+        viewModel.onProvidedPositiveOpenEndedFeedback(feedback)
+    }
+
+
     /**
-     * Positive open ended feedback listener
+     * Negative feedback listeners
      */
     override fun onProvidedNegativeOpenEndedFeedback(feedback: String) {
-        viewModel.userProvidedOpenEndedFeedback(feedback)
+        viewModel.onProvidedNegativeOpenEndedFeedback(feedback)
     }
 
     /**
-     * Negative feedback disambiguation
+     * Negative feedback main reason selection
      */
-    override fun userSelectedNegativeFeedbackTypeDisambiguationMainReason(type: FeedbackType.MainReason) {
+    override fun userSelectedNegativeFeedbackMainReason(type: MainReason) {
         viewModel.userSelectedNegativeFeedbackMainReason(type)
     }
 
 
-    override fun userSelectedSubReasonMissingBrowser(type: FeedbackType.MissingBrowserFeaturesSubreasons) {
-        viewModel.userSelectedNegativeFeedbackMissingBrowserSubReason(type)
-    }
+    /**
+     * Negative feedback subReason selection
+     */
 
-    override fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading) {
-        viewModel.userSelectedSubReasonWebsitesNotLoading(type)
+    override fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: MissingBrowserFeaturesSubReasons) {
+        viewModel.userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason, subReason)
     }
 
-    override fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough) {
-        viewModel.userSelectedSubReasonSearchNotGoodEnough(type)
+    override fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: SearchNotGoodEnoughSubReasons) {
+        viewModel.userSelectedSubReasonSearchNotGoodEnough(mainReason, subReason)
     }
 
-    override fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization) {
-        viewModel.userSelectedSubReasonNeedMoreCustomization(type)
+    override fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: CustomizationSubReasons) {
+        viewModel.userSelectedSubReasonNeedMoreCustomization(mainReason, subReason)
     }
 
-    override fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy) {
-        viewModel.userSelectedSubReasonAppIsSlowOrBuggy(type)
+    override fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: PerformanceSubReasons) {
+        viewModel.userSelectedSubReasonAppIsSlowOrBuggy(mainReason, subReason)
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 74c264dc0dee..12da5fbe239e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -21,7 +21,7 @@ import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubreasons
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
 import timber.log.Timber
 
@@ -31,9 +31,9 @@ class FeedbackViewModel : ViewModel() {
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
     init {
-        //viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
+        viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
         //viewState.value = ViewState(fragmentViewState = FragmentState.PositiveShareFeedback(NAVIGATION_FORWARDS))
-        viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
+        //viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
     }
 
     private val currentViewState: ViewState
@@ -61,19 +61,36 @@ class FeedbackViewModel : ViewModel() {
             is NegativeFeedbackSubReason -> {
                 viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
             }
-            else -> {
-                Timber.w("Still needs wired up")
+            is NegativeOpenEndedFeedback -> {
+                val newViewState = when (currentViewState.previousViewState) {
+                    is NegativeFeedbackSubReason -> {
+                        NegativeFeedbackSubReason(NAVIGATION_BACKWARDS, currentViewState.mainReason!!)
+                    }
+                    is NegativeFeedbackMainReason -> {
+                        NegativeFeedbackMainReason(NAVIGATION_BACKWARDS)
+                    }
+                    else -> {
+                        NegativeFeedbackMainReason(NAVIGATION_BACKWARDS)
+                    }
+                }
+                viewState.value = currentViewState.copy(fragmentViewState = newViewState)
             }
         }
     }
 
 
     fun userSelectedPositiveFeedback() {
-        viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS))
+        viewState.value = currentViewState.copy(
+            fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
     fun userSelectedNegativeFeedback() {
-        viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
+        viewState.value = currentViewState.copy(
+            fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
     fun userWantsToCancel() {
@@ -83,37 +100,77 @@ class FeedbackViewModel : ViewModel() {
 
     fun userSelectedToGiveFeedback() {
         Timber.i("User gave feedback")
-        viewState.value = currentViewState.copy(fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS))
+        viewState.value = currentViewState.copy(
+            fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
-    fun userProvidedOpenEndedFeedback(feedback: String) {
-        Timber.i("User provided feedback: {$feedback}")
+    fun onProvidedNegativeOpenEndedFeedback(feedback: String) {
+        Timber.i("User provided negative feedback: {$feedback}")
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userSelectedNegativeFeedbackMainReason(type: MainReason) {
-        val newState = NegativeFeedbackSubReason(NAVIGATION_FORWARDS, type)
-        viewState.value = currentViewState.copy(fragmentViewState = newState)
+    fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
+        Timber.i("User provided positive feedback: {$feedback}")
+        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userSelectedNegativeFeedbackMissingBrowserSubReason(type: MissingBrowserFeaturesSubreasons) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    fun userSelectedNegativeFeedbackMainReason(mainReason: MainReason) {
+        val newState = when (mainReason) {
+            MainReason.MISSING_BROWSING_FEATURES -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.WEBSITES_NOT_LOADING -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
+            MainReason.SEARCH_NOT_GOOD_ENOUGH -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.NOT_ENOUGH_CUSTOMIZATIONS -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.APP_IS_SLOW_OR_BUGGY -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
+        }
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = null,
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
-    fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    fun userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
+        val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
-    fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: FeedbackType.SearchNotGoodEnoughSubReasons) {
+        val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
-    fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: FeedbackType.CustomizationSubReasons) {
+        val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
-    fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons) {
+        val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
+        )
     }
 
     companion object {
@@ -123,7 +180,10 @@ class FeedbackViewModel : ViewModel() {
 }
 
 data class ViewState(
-    val fragmentViewState: FragmentState
+    val fragmentViewState: FragmentState,
+    val previousViewState: FragmentState? = null,
+    val mainReason: MainReason? = null,
+    val subReason: SubReason? = null
 )
 
 sealed class FragmentState(open val direction: NavigationDirection) {
@@ -137,7 +197,8 @@ sealed class FragmentState(open val direction: NavigationDirection) {
     // negative flow
     data class NegativeFeedbackMainReason(override val direction: NavigationDirection) : FragmentState(direction)
     data class NegativeFeedbackSubReason(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
-    data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
+    data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason, val subReason: SubReason? = null) :
+        FragmentState(direction)
 
 }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
index e4b362d581b6..9cb0521c128d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
@@ -16,18 +16,21 @@
 
 package com.duckduckgo.app.feedback.ui.negative
 
+import java.io.Serializable
+
 sealed class FeedbackType {
 
     enum class MainReason {
         MISSING_BROWSING_FEATURES,
         WEBSITES_NOT_LOADING,
         SEARCH_NOT_GOOD_ENOUGH,
-        NOT_ENOUGH_CUSOMIZATIONS,
+        NOT_ENOUGH_CUSTOMIZATIONS,
         APP_IS_SLOW_OR_BUGGY,
         OTHER
     }
 
-    interface SubReason
+    interface SubReason : Serializable {
+    }
 
     enum class MissingBrowserFeaturesSubReasons : SubReason {
         NAVIGATION_ISSUES,
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
new file mode 100644
index 000000000000..d09b2d1b595a
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative
+
+import androidx.annotation.StringRes
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.OTHER
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
+
+fun MainReason.displayText(): FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay? = FeedbackTypeDisplay.mainReasons[this]
+fun SubReason.displayText(): FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay? = FeedbackTypeDisplay.subReasons[this]
+
+class FeedbackTypeDisplay {
+
+    data class FeedbackTypeMainReasonDisplay(
+        val mainReason: MainReason,
+
+        @StringRes
+        val listDisplayResId: Int,
+
+        @StringRes
+        val titleDisplayResId: Int,
+
+        @StringRes
+        val subtitleDisplayResId: Int
+    )
+
+    data class FeedbackTypeSubReasonDisplay(
+        val subReason: SubReason,
+
+        @StringRes
+        val titleDisplayResId: Int
+    )
+
+    companion object {
+        val mainReasons: Map<MainReason, FeedbackTypeMainReasonDisplay> = mutableMapOf<MainReason, FeedbackTypeMainReasonDisplay>().also {
+
+            MISSING_BROWSING_FEATURES.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    listDisplayResId = R.string.missingBrowserFeaturesTitleLong,
+                    titleDisplayResId = R.string.missingBrowserFeaturesTitleShort,
+                    subtitleDisplayResId = R.string.missingBrowserFeaturesSubtitle
+                )
+            }
+
+            WEBSITES_NOT_LOADING.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    R.string.websiteNotLoadingTitleShort,
+                    R.string.websiteNotLoadingTitleLong,
+                    R.string.websiteNotLoadingSubtitle
+                )
+            }
+
+            SEARCH_NOT_GOOD_ENOUGH.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    R.string.searchNotGoodEnoughTitleLong,
+                    R.string.searchNotGoodEnoughTitleShort,
+                    R.string.searchNotGoodEnoughSubtitle
+                )
+            }
+
+            NOT_ENOUGH_CUSTOMIZATIONS.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    R.string.needMoreCustomizationTitleLong,
+                    R.string.needMoreCustomizationTitleShort,
+                    R.string.needMoreCustomizationSubtitle
+                )
+            }
+
+            APP_IS_SLOW_OR_BUGGY.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    R.string.appIsSlowOrBuggyTitleLong,
+                    R.string.appIsSlowOrBuggyTitleShort,
+                    R.string.appIsSlowOrBuggySubtitle
+                )
+            }
+
+            OTHER.also { type ->
+                it[type] = FeedbackTypeMainReasonDisplay(
+                    type,
+                    R.string.otherMainReasonTitleLong,
+                    R.string.otherMainReasonTitleShort,
+                    R.string.otherMainReasonSubtitle
+                )
+            }
+
+        }
+
+        val subReasons: Map<SubReason, FeedbackTypeSubReasonDisplay> = mutableMapOf<SubReason, FeedbackTypeSubReasonDisplay>().also {
+
+            NAVIGATION_ISSUES.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonNavigation)
+            }
+
+            TAB_MANAGEMENT.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonTabManagement)
+            }
+
+            AD_POPUP_BLOCKING.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonAdPopups)
+            }
+
+            WATCHING_VIDEOS.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonVideos)
+            }
+
+            INTERACTING_IMAGES.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonImages)
+            }
+
+            BOOKMARK_MANAGEMENT.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonBookmarks)
+            }
+
+            MissingBrowserFeaturesSubReasons.OTHER.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.tellUsHowToImprove)
+            }
+
+            PROGRAMMING_TECHNICAL_SEARCHES.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonTechnicalSearches)
+            }
+
+            LAYOUT_MORE_LIKE_GOOGLE.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonGoogleLayout)
+            }
+
+            FASTER_LOAD_TIME.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonFasterLoadTimes)
+            }
+
+            SEARCHING_IN_SPECIFIC_LANGUAGE.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonSpecificLanguage)
+            }
+
+            BETTER_AUTOCOMPLETE.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonBetterAutocomplete)
+            }
+
+            SearchNotGoodEnoughSubReasons.OTHER.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.tellUsHowToImprove)
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
index f248ad7b6991..39b0637efc03 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
@@ -32,7 +32,7 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
     override val fragmentTag: String = "Disambiguation negative feedback"
 
     interface MainReasonNegativeFeedbackListener {
-        fun userSelectedNegativeFeedbackTypeDisambiguationMainReason(type: MainReason)
+        fun userSelectedNegativeFeedbackMainReason(type: MainReason)
     }
 
     private val viewModel by bindViewModel<MainReasonNegativeFeedbackViewModel>()
@@ -47,8 +47,8 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
     override fun configureViewModelObservers() {
         viewModel.command.observe(this, Observer { command ->
             when (command) {
-                is MainReasonNegativeFeedbackViewModel.Command.NavigateNegativeOpenEndedFeedbackScreen -> {
-                    listener?.userSelectedNegativeFeedbackTypeDisambiguationMainReason(command.type)
+                is MainReasonNegativeFeedbackViewModel.Command.UserSelectedFeedbackType -> {
+                    listener?.userSelectedNegativeFeedbackMainReason(command.type)
                 }
             }
         })
@@ -58,7 +58,7 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
         optionMissingFeatures.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.MISSING_BROWSING_FEATURES) }
         optionWebsitesNotLoading.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.WEBSITES_NOT_LOADING) }
         optionSearchNotGoodEnough.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.SEARCH_NOT_GOOD_ENOUGH) }
-        optionNotEnoughCustomizationOptions.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.NOT_ENOUGH_CUSOMIZATIONS) }
+        optionNotEnoughCustomizationOptions.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.NOT_ENOUGH_CUSTOMIZATIONS) }
         optionAppIsSlowOrBuggy.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.APP_IS_SLOW_OR_BUGGY) }
         optionNoneOfThese.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.OTHER) }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
index 6369f9d2d8a6..7984c5c5d853 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
 
 
 class MainReasonNegativeFeedbackViewModel : ViewModel() {
@@ -33,10 +32,8 @@ class MainReasonNegativeFeedbackViewModel : ViewModel() {
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
 
-    fun userSelectedFeedbackType(type: MainReason) {
-        Timber.i("User selected feedback type: $type")
-        command.value =
-            Command.NavigateNegativeOpenEndedFeedbackScreen(type)
+    fun userSelectedFeedbackType(mainReason: MainReason) {
+        command.value = Command.UserSelectedFeedbackType(mainReason)
     }
 
     sealed class ViewState {
@@ -44,7 +41,7 @@ class MainReasonNegativeFeedbackViewModel : ViewModel() {
     }
 
     sealed class Command {
-        data class NavigateNegativeOpenEndedFeedbackScreen(val type: MainReason) : Command()
+        data class UserSelectedFeedbackType(val type: MainReason) : Command()
     }
 
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
index 6b7838f9cd6f..e4433df1e24a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -34,6 +33,7 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReasons.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.displayText
 import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_sub_reason.*
 import timber.log.Timber
 
@@ -45,11 +45,10 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
     private lateinit var recyclerAdapter: SubReasonAdapter
 
     interface DisambiguationNegativeFeedbackListener {
-        fun userSelectedSubReasonMissingBrowser(type: FeedbackType.MissingBrowserFeaturesSubreasons)
-        fun userSelectedSubReasonWebsitesNotLoading(type: FeedbackType.WebsitesNotLoading)
-        fun userSelectedSubReasonSearchNotGoodEnough(type: FeedbackType.SearchResultsNotGoodEnough)
-        fun userSelectedSubReasonNeedMoreCustomization(type: FeedbackType.NeedMoreCustomization)
-        fun userSelectedSubReasonAppIsSlowOrBuggy(type: FeedbackType.AppIsSlowOrBuggy)
+        fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons)
+        fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: FeedbackType.SearchNotGoodEnoughSubReasons)
+        fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: FeedbackType.CustomizationSubReasons)
+        fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons)
     }
 
     private val viewModel by bindViewModel<SubReasonNegativeFeedbackViewModel>()
@@ -57,13 +56,28 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
     private val listener: DisambiguationNegativeFeedbackListener?
         get() = activity as DisambiguationNegativeFeedbackListener
 
+    private lateinit var mainReason: MainReason
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = inflater.inflate(R.layout.content_feedback_negative_disambiguation_sub_reason, container, false)
 
         recyclerAdapter = SubReasonAdapter(object : (SubReasonDisplay) -> Unit {
             override fun invoke(reason: SubReasonDisplay) {
                 Timber.i("Clicked reason: $reason")
-                viewModel.userSelectedFeedbackType(reason.feedbackType)
+                when (reason.feedbackType) {
+                    is MissingBrowserFeaturesSubReasons -> {
+                        listener?.userSelectedSubReasonMissingBrowserFeatures(mainReason, reason.feedbackType)
+                    }
+                    is SearchNotGoodEnoughSubReasons -> {
+                        listener?.userSelectedSubReasonSearchNotGoodEnough(mainReason, reason.feedbackType)
+                    }
+                    is CustomizationSubReasons -> {
+                        listener?.userSelectedSubReasonNeedMoreCustomization(mainReason, reason.feedbackType)
+                    }
+                    is PerformanceSubReasons -> {
+                        listener?.userSelectedSubReasonAppIsSlowOrBuggy(mainReason, reason.feedbackType)
+                    }
+                }
             }
         })
 
@@ -81,46 +95,25 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
 
             arguments?.let { args ->
 
-                val mainReason = values()[args.getInt(MAIN_REASON_EXTRA)]
-                val display = getDisplayTextForReasonType(mainReason)
-
-                title.text = getString(display.title)
-                subtitle.text = getString(display.subtitle)
+                mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason
+                val display = mainReason.displayText()
 
+                title.text = getString(display!!.titleDisplayResId)
+                subtitle.text = getString(display.subtitleDisplayResId)
 
-                //val subreasons = activity?.resources?.getStringArray(args.getInt(SUBREASONS_EXTRA))?.toList() ?: emptyList()
-
-                //title.text = getString(args.getInt(TITLE_EXTRA))
-                //subtitle.text = getString(args.getInt(SUBTITLE_EXTRA))
-                Timber.i("There are ${display.subReasons.size} subReasons to show")
-                recyclerAdapter.submitList(display.subReasons)
+                val subReasons = getDisplayTextForReasonType(mainReason)
+                Timber.i("There are ${subReasons.size} subReasons to show")
+                recyclerAdapter.submitList(subReasons)
             }
         }
-
     }
 
-    private fun getDisplayTextForReasonType(mainReason: MainReason): Display {
+    private fun getDisplayTextForReasonType(mainReason: MainReason): List<SubReasonDisplay> {
         return when (mainReason) {
-            MISSING_BROWSING_FEATURES -> Display(
-                R.string.missingBrowserFeaturesTitleShort,
-                R.string.missingBrowserFeaturesSubtitle,
-                browserFeatureSubReasons()
-            )
-            SEARCH_NOT_GOOD_ENOUGH -> Display(
-                R.string.searchNotGoodEnoughTitleShort,
-                R.string.searchNotGoodEnoughSubtitle,
-                searchNotGoodEnoughSubReasons()
-            )
-            NOT_ENOUGH_CUSOMIZATIONS -> Display(
-                R.string.needMoreCustomizationTitleShort,
-                R.string.needMoreCustomizationSubtitle,
-                moreCustomizationsSubReasons()
-            )
-            APP_IS_SLOW_OR_BUGGY -> Display(
-                R.string.appIsSlowOrBuggyTitleShort,
-                R.string.appIsSlowOrBuggySubtitle,
-                appSlowOrBuggySubReasons()
-            )
+            MISSING_BROWSING_FEATURES -> browserFeatureSubReasons()
+            SEARCH_NOT_GOOD_ENOUGH -> searchNotGoodEnoughSubReasons()
+            NOT_ENOUGH_CUSTOMIZATIONS -> moreCustomizationsSubReasons()
+            APP_IS_SLOW_OR_BUGGY -> appSlowOrBuggySubReasons()
             else -> throw IllegalStateException("Not handled - $mainReason")
         }
     }
@@ -172,20 +165,10 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
 
     override fun configureViewModelObservers() {
         viewModel.command.observe(this, Observer { command ->
-            when (command) {
-                is SubReasonNegativeFeedbackViewModel.Command.NavigateNegativeOpenEndedFeedbackScreen -> {
-                    //listener?.userSelectedNegativeFeedbackTypeDisambiguationSubReason(command.type)
-                }
-            }
+
         })
     }
 
-    data class Display(
-        @StringRes val title: Int,
-        @StringRes val subtitle: Int,
-        val subReasons: List<SubReasonDisplay>
-    )
-
     data class SubReasonDisplay(val feedbackType: SubReason, val displayString: String)
 
     companion object {
@@ -195,18 +178,9 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         fun instance(mainReason: MainReason): SubReasonNegativeFeedbackFragment {
             val fragment = SubReasonNegativeFeedbackFragment()
             fragment.arguments = Bundle().also {
-                it.putInt(MAIN_REASON_EXTRA, mainReason.ordinal)
+                it.putSerializable(MAIN_REASON_EXTRA, mainReason)
             }
             return fragment
         }
-
-//        fun instance(@StringRes titleResId: Int, @StringRes subTitleResId: Int, @ArrayRes subreasonStringArrayId: Int): SubReasonNegativeFeedbackFragment {
-//            val fragment = SubReasonNegativeFeedbackFragment()
-//            fragment.arguments = Bundle().also {
-//                it.putInt(TITLE_EXTRA, titleResId)
-//                it.putInt(SUBTITLE_EXTRA, subTitleResId)
-//                it.putInt(SUBREASONS_EXTRA, subreasonStringArrayId)
-//            }
-//            return fragment
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
index ebdff9a4a39d..c9b2f144bea2 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
@@ -20,7 +20,6 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
 
 
 class SubReasonNegativeFeedbackViewModel : ViewModel() {
@@ -33,11 +32,6 @@ class SubReasonNegativeFeedbackViewModel : ViewModel() {
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
 
-    fun userSelectedFeedbackType(type: FeedbackType) {
-        Timber.i("User selected feedback type: $type")
-        command.value = Command.NavigateNegativeOpenEndedFeedbackScreen(type)
-    }
-
     sealed class ViewState {
 
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
index 6ab43c4c6985..d962ee52b42c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
@@ -23,25 +23,30 @@ import android.view.ViewGroup
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType
-import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel
-import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
-import kotlinx.android.synthetic.main.content_feedback_positive_open_ended_feedback.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.mainReasons
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.subReasons
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
+import kotlinx.android.synthetic.main.content_feedback_negative_open_ended_feedback.*
 
 
 class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
 
     override val fragmentTag: String = "Open ended negative feedback"
 
-    interface OpenEndedNegativeFeedbackListener {
+    interface OpenEndedFeedbackListener {
         fun onProvidedNegativeOpenEndedFeedback(feedback: String)
+        fun onProvidedPositiveOpenEndedFeedback(feedback: String)
         fun userCancelled()
     }
 
     private val viewModel by bindViewModel<ShareOpenEndedNegativeFeedbackViewModel>()
 
-    private val listener: OpenEndedNegativeFeedbackListener?
-        get() = activity as OpenEndedNegativeFeedbackListener
+    private val listener: OpenEndedFeedbackListener?
+        get() = activity as OpenEndedFeedbackListener
+
+    private var isPositiveFeedback: Boolean = true
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.content_feedback_negative_open_ended_feedback, container, false)
@@ -53,9 +58,12 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
                 is Command.Exit -> {
                     listener?.userCancelled()
                 }
-                is Command.ExitAndSubmit -> {
+                is Command.ExitAndSubmitNegativeFeedback -> {
                     listener?.onProvidedNegativeOpenEndedFeedback(command.feedback)
                 }
+                is Command.ExitAndSubmitPositiveFeedback -> {
+                    listener?.onProvidedPositiveOpenEndedFeedback(command.feedback)
+                }
             }
         })
     }
@@ -63,24 +71,75 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
+        if (arguments == null) throw IllegalArgumentException("Missing required arguments")
+
         arguments?.let { args ->
-            title.text = "to do!"
-            subtitle.text = "to do!"
+
+            isPositiveFeedback = args.getBoolean(IS_POSITIVE_FEEDBACK_EXTRA)
+
+            if (isPositiveFeedback) {
+                updateDisplayForPositiveFeedback()
+            } else {
+                updateDisplayForNegativeFeedback(args)
+            }
         }
     }
 
+    private fun updateDisplayForPositiveFeedback() {
+        title.text = getString(R.string.feedbackShareDetails)
+        subtitle.text = getString(R.string.sharePositiveFeedbackWithTheTeam)
+        openEndedFeedbackContainer.hint = getString(R.string.whatHaveYouBeenEnjoying)
+        emoticonImage.setImageResource(R.drawable.ic_positive_feedback)
+    }
+
+    private fun updateDisplayForNegativeFeedback(args: Bundle) {
+        val mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason
+        val subReason = args.getSerializable(SUB_REASON_EXTRA) as SubReason?
+
+        title.text = getDisplayText(mainReason)
+        subtitle.text = getDisplayText(subReason)
+        openEndedFeedbackContainer.hint = getString(R.string.openEndedInputHint)
+        emoticonImage.setImageResource(R.drawable.ic_negative_feedback)
+    }
+
+    private fun getDisplayText(reason: MainReason): String {
+        val display = mainReasons[reason] ?: return ""
+        return getString(display.titleDisplayResId)
+    }
+
+    private fun getDisplayText(reason: SubReason?): String {
+        val display = subReasons[reason] ?: return getString(R.string.tellUsHowToImprove)
+        return getString(display.titleDisplayResId)
+    }
+
     override fun configureListeners() {
-        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString()) }
+        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString(), isPositiveFeedback) }
     }
 
     companion object {
 
         private const val MAIN_REASON_EXTRA = "MAIN_REASON_EXTRA"
+        private const val SUB_REASON_EXTRA = "SUB_REASON_EXTRA"
+        private const val IS_POSITIVE_FEEDBACK_EXTRA = "IS_POSITIVE_FEEDBACK_EXTRA"
+
+        fun instanceNegativeFeedback(mainReason: MainReason, subReason: SubReason?): ShareOpenEndedNegativeFeedbackFragment {
+            val fragment = ShareOpenEndedNegativeFeedbackFragment()
+            fragment.arguments = Bundle().also {
+                it.putBoolean(IS_POSITIVE_FEEDBACK_EXTRA, false)
+
+                it.putSerializable(MAIN_REASON_EXTRA, mainReason)
+
+                if (subReason != null) {
+                    it.putSerializable(SUB_REASON_EXTRA, subReason)
+                }
+            }
+            return fragment
+        }
 
-        fun instance(mainReason: FeedbackType.MainReason): ShareOpenEndedNegativeFeedbackFragment {
+        fun instancePositiveFeedback(): ShareOpenEndedNegativeFeedbackFragment {
             val fragment = ShareOpenEndedNegativeFeedbackFragment()
             fragment.arguments = Bundle().also {
-                it.putInt(MAIN_REASON_EXTRA, mainReason.ordinal)
+                it.putBoolean(IS_POSITIVE_FEEDBACK_EXTRA, true)
             }
             return fragment
         }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
index 9258cf42f9f8..c7e59cfd1fa8 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.positive.openended
+package com.duckduckgo.app.feedback.ui.negative.openended
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
 
 
 class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
@@ -32,9 +31,12 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
 
-    fun userSubmittingFeedback(feedback: String) {
-        Timber.i("Received feedback: {$feedback}")
-        command.value = Command.ExitAndSubmit(feedback)
+    fun userSubmittingFeedback(feedback: String, isPositiveFeedback: Boolean) {
+        if (isPositiveFeedback) {
+            command.value = Command.ExitAndSubmitPositiveFeedback(feedback)
+        } else {
+            command.value = Command.ExitAndSubmitNegativeFeedback(feedback)
+        }
     }
 
     sealed class ViewState {
@@ -42,7 +44,8 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
     }
 
     sealed class Command {
-        data class ExitAndSubmit(val feedback: String) : Command()
+        data class ExitAndSubmitNegativeFeedback(val feedback: String) : Command()
+        data class ExitAndSubmitPositiveFeedback(val feedback: String) : Command()
         object Exit : Command()
     }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
deleted file mode 100644
index fa9a06e18ec4..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackFragment.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2019 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.feedback.ui.positive.openended
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.Observer
-import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
-import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
-import kotlinx.android.synthetic.main.content_feedback_positive_open_ended_feedback.*
-
-
-class ShareOpenEndedPositiveFeedbackFragment : FeedbackFragment() {
-
-    override val fragmentTag: String = "Open ended positive feedback"
-
-    interface OpenEndedPositiveFeedbackListener {
-        fun onProvidedOpenEndedFeedback(feedback: String)
-        fun userCancelled()
-    }
-
-    private val viewModel by bindViewModel<ShareOpenEndedNegativeFeedbackViewModel>()
-
-    private val listener: OpenEndedPositiveFeedbackListener?
-        get() = activity as OpenEndedPositiveFeedbackListener
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.content_feedback_positive_open_ended_feedback, container, false)
-    }
-
-    override fun configureViewModelObservers() {
-        viewModel.command.observe(this, Observer { command ->
-            when (command) {
-                is Command.Exit -> {
-                    listener?.userCancelled()
-                }
-                is Command.ExitAndSubmit -> {
-                    listener?.onProvidedOpenEndedFeedback(command.feedback)
-                }
-            }
-        })
-    }
-
-    override fun configureListeners() {
-        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString()) }
-    }
-
-    companion object {
-
-        fun instance(): ShareOpenEndedNegativeFeedbackFragment {
-            val fragment = ShareOpenEndedNegativeFeedbackFragment()
-            return fragment
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
deleted file mode 100644
index 8f68e0515c6f..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/openended/ShareOpenEndedPositiveFeedbackViewModel.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2019 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.feedback.ui.positive.openended
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
-
-
-class ShareOpenEndedPositiveFeedbackViewModel : ViewModel() {
-
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
-    val command: SingleLiveEvent<Command> = SingleLiveEvent()
-
-
-    fun userSubmittingFeedback(feedback: String) {
-        Timber.i("Received feedback: {$feedback}")
-        command.value = Command.ExitAndSubmit(feedback)
-    }
-
-    sealed class ViewState {
-
-    }
-
-    sealed class Command {
-        data class ExitAndSubmit(val feedback: String) : Command()
-        object Exit : Command()
-    }
-}
-
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 3a07cb933283..a95239faf40d 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -37,7 +37,7 @@ import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel
 import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackViewModel
 import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackViewModel
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingViewModel
-import com.duckduckgo.app.feedback.ui.positive.openended.ShareOpenEndedNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel
 import com.duckduckgo.app.fire.DataClearer
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.install.AppInstallStore
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index 338c1f42fb7e..a18abb85ca54 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:fontFamily="sans-serif-medium"
-            android:text="We're sorry to hear that."
+            android:text="@string/feedbackNegativeMainReasonPageTitle"
             android:textAlignment="center"
             android:textColor="@color/almostBlackDark"
             android:textSize="22sp"
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
             android:fontFamily="sans-serif"
-            android:text="What is your frustration most related to?"
+            android:text="@string/feedbackNegativeMainReasonPageSubtitle"
             android:textAlignment="center"
             android:textColor="@color/almostBlack"
             android:textSize="15sp"
@@ -89,7 +89,7 @@
                 android:paddingEnd="22dp"
                 android:gravity="center_vertical"
                 android:minHeight="50dp"
-                android:text="Browser features are missing or frustrating"
+                android:text="@string/missingBrowserFeaturesTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
@@ -108,7 +108,7 @@
                 android:minHeight="50dp"
                 android:paddingStart="22dp"
                 android:paddingEnd="22dp"
-                android:text="Certain websites don't load correctly"
+                android:text="@string/websiteNotLoadingTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
@@ -127,7 +127,7 @@
                 android:minHeight="50dp"
                 android:paddingStart="22dp"
                 android:paddingEnd="22dp"
-                android:text="DuckDuckGo search isn't good enough"
+                android:text="@string/searchNotGoodEnoughTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
@@ -146,7 +146,7 @@
                 android:minHeight="50dp"
                 android:paddingStart="22dp"
                 android:paddingEnd="22dp"
-                android:text="Not enough ways to customize the app"
+                android:text="@string/needMoreCustomizationTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
@@ -165,7 +165,7 @@
                 android:minHeight="50dp"
                 android:paddingStart="22dp"
                 android:paddingEnd="22dp"
-                android:text="App is slow, buggy, or crashes"
+                android:text="@string/appIsSlowOrBuggyTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
@@ -184,7 +184,7 @@
                 android:minHeight="50dp"
                 android:paddingStart="22dp"
                 android:paddingEnd="22dp"
-                android:text="None of these"
+                android:text="@string/otherMainReasonTitleLong"
                 android:textColor="@color/greyishBrownTwo"
                 android:textSize="14sp" />
 
diff --git a/app/src/main/res/layout/content_feedback_positive_landing.xml b/app/src/main/res/layout/content_feedback_positive_landing.xml
index 434f1486ce2e..1c295ae17228 100644
--- a/app/src/main/res/layout/content_feedback_positive_landing.xml
+++ b/app/src/main/res/layout/content_feedback_positive_landing.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:fontFamily="sans-serif-medium"
-            android:text="Awesome to hear!"
+            android:text="@string/awesomeToHear"
             android:textAlignment="center"
             android:textColor="@color/almostBlackDark"
             android:textSize="22sp"
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
             android:fontFamily="sans-serif"
-            android:text="Please share the love by rating on the Play Store"
+            android:text="@string/shareTheLoveWithARating"
             android:textAlignment="center"
             android:textColor="@color/almostBlack"
             android:textSize="15sp"
@@ -73,7 +73,7 @@
             android:layout_marginEnd="20dp"
             android:background="@drawable/button_contained_bg"
             android:foreground="?attr/selectableItemBackground"
-            android:text="RATE THE APP"
+            android:text="@string/rateTheApp"
             android:textColor="@color/white"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -90,7 +90,7 @@
             android:layout_marginEnd="20dp"
             android:background="@drawable/report_broken_site_button_outlined_bg"
             android:foreground="?attr/selectableItemBackground"
-            android:text="SHARE FEEDBACK"
+            android:text="@string/feedbackShareDetails"
             android:textColor="@color/cornflowerBlue"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -106,7 +106,7 @@
             android:layout_marginTop="18dp"
             android:layout_marginEnd="20dp"
             android:background="@null"
-            android:text="NO THANKS, I'M DONE"
+            android:text="@string/declineFurtherFeedback"
             android:textColor="@color/cornflowerBlue"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml
deleted file mode 100644
index cece0ccdb359..000000000000
--- a/app/src/main/res/layout/content_feedback_positive_open_ended_feedback.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
-
-        <ImageView
-            android:id="@+id/emoticonImage"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_positive_feedback"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
-            android:text="Share feedback"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
-
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
-            android:text="Is there anything specific about the app that you're enjoying?"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.66" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/openEndedFeedbackContainer"
-            style="@style/FeedbackInputBoxStyle"
-            android:layout_width="0dp"
-            android:layout_height="140dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="65dp"
-            android:layout_marginEnd="20dp"
-            android:hint="What have you been enjoying?"
-            app:hintTextAppearance="@style/FeedbackInputHintStyle"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/openEndedFeedback"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:gravity="top"
-                android:imeOptions="flagNoExtractUi"
-                android:importantForAutofill="no"
-                android:inputType="textLongMessage|textMultiLine"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-        </com.google.android.material.textfield.TextInputLayout>
-
-
-        <Button
-            android:id="@+id/submitFeedbackButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="78dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/button_contained_bg"
-            android:foreground="?attr/selectableItemBackground"
-            android:text="SUBMIT FEEDBACK"
-            android:textColor="@color/white"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index 7dcaa20223a0..f821070b47ef 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -20,7 +20,7 @@
     <string name="missingBrowserFeaturesTitleShort">Browser feature issues</string>
     <string name="missingBrowserFeaturesSubtitle">Which browsing feature can we add or improve?</string>
     <string name="missingBrowserFeatureSubReasonNavigation">Navigating forward, backward, refreshing</string>
-    <string name="missingBrowserFeatureSubReasonTabManagement">Navigating forward, backward, refreshing</string>
+    <string name="missingBrowserFeatureSubReasonTabManagement">Creating and managing tabs</string>
     <string name="missingBrowserFeatureSubReasonAdPopups">Ad and pop-up blocking</string>
     <string name="missingBrowserFeatureSubReasonVideos">Watching videos</string>
     <string name="missingBrowserFeatureSubReasonImages">Interacting with images</string>
@@ -52,7 +52,7 @@
     <string name="needMoreCustomizationSubReasonBookmarksDisplay">How bookmarks are displayed</string>
     <string name="needMoreCustomizationSubReasonOther">None of these</string>
 
-    <string name="appIsSlowOrBuggyTitleLong">There aren\'t enough ways to customize the app</string>
+    <string name="appIsSlowOrBuggyTitleLong">The app is slow, buggy, or crashes</string>
     <string name="appIsSlowOrBuggyTitleShort">Performance issues</string>
     <string name="appIsSlowOrBuggySubtitle">Which issue are you experiencing?</string>
     <string name="appIsSlowOrBuggySubReasonSlowResults">Web pages or search results load slowly</string>
@@ -61,12 +61,25 @@
     <string name="appIsSlowOrBuggySubReasonOther">None of these</string>
 
     <string name="otherMainReasonTitleLong">None of these</string>
-    <string name="otherMainReasonTitleShort">Your feedback is important to us</string>
-    <string name="otherMainReasonSubtitle">Please tell us what we can improve</string>
+    <string name="otherMainReasonTitleShort">Other issues</string>
+    <string name="otherMainReasonSubtitle">@string/tellUsHowToImprove</string>
 
     <string name="openEndedInputHint">How can we improve? (Optional)</string>
     <string name="submitFeedback">SUBMIT FEEDBACK</string>
     <string name="appreciateYourFeedback">We appreciate your feedback</string>
     <string name="anonymousFeedbackIsImportant">Your anonymous feedback is important to us</string>
 
+    <string name="tellUsHowToImprove">Please tell us what we can improve</string>
+    <string name="thanksForTheFeedback">Thanks for the feedback!</string>
+    <string name="feedbackNegativeMainReasonPageSubtitle">What is your frustration most related to?</string>
+    <string name="feedbackNegativeMainReasonPageTitle">We\'re sorry to hear that</string>
+    <string name="feedbackShareDetails">Share details</string>
+    <string name="sharePositiveFeedbackWithTheTeam">Are there any details you\'d like to share with the team?</string>
+    <string name="whatHaveYouBeenEnjoying">What have you been enjoying?</string>
+    <string name="awesomeToHear">Awesome to hear!</string>
+    <string name="shareTheLoveWithARating">Please share the love by rating on the Play Store</string>
+    <string name="rateTheApp">RATE THE APP</string>
+    <string name="declineFurtherFeedback">NO THANKS, I\'M DONE</string>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aab4020492c8..ad52bb4a3824 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -276,7 +276,4 @@
     <string name="clearNotificationTitle">Data clearing set to manual</string>
     <string name="clearNotificationDescription">Customize DuckDuckGo to automatically clear browsing data after every session.</string>
 
-    <!-- Feedback -->
-    <string name="thanksForTheFeedback">Thanks for the feedback!</string>
-
 </resources>

From 4b7d47f311fd7261f152c73cc3629a740b44e832 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 13 Mar 2019 17:25:15 +0000
Subject: [PATCH 05/47] All copy in working order across the screens

---
 .../ui/negative/FeedbackTypeDisplay.kt        | 59 ++++++++++++--
 .../ui/negative/initial/SubReasonAdapter.kt   | 16 ++--
 .../SubReasonNegativeFeedbackFragment.kt      | 77 +++++++------------
 .../ShareOpenEndedNegativeFeedbackFragment.kt |  2 +-
 4 files changed, 88 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
index d09b2d1b595a..6cf413e6cd09 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -19,9 +19,11 @@ package com.duckduckgo.app.feedback.ui.negative
 import androidx.annotation.StringRes
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.CustomizationSubReasons.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.OTHER
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReasons.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
 
 fun MainReason.displayText(): FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay? = FeedbackTypeDisplay.mainReasons[this]
@@ -46,7 +48,10 @@ class FeedbackTypeDisplay {
         val subReason: SubReason,
 
         @StringRes
-        val titleDisplayResId: Int
+        val listDisplayResId: Int,
+
+        @StringRes
+        val subtitleDisplayResId: Int = listDisplayResId
     )
 
     companion object {
@@ -135,7 +140,7 @@ class FeedbackTypeDisplay {
             }
 
             MissingBrowserFeaturesSubReasons.OTHER.also { type ->
-                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.tellUsHowToImprove)
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.missingBrowserFeatureSubReasonOther, R.string.tellUsHowToImprove)
             }
 
             PROGRAMMING_TECHNICAL_SEARCHES.also { type ->
@@ -154,12 +159,54 @@ class FeedbackTypeDisplay {
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonSpecificLanguage)
             }
 
-            BETTER_AUTOCOMPLETE.also { type ->
-                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonBetterAutocomplete)
+            SearchNotGoodEnoughSubReasons.OTHER.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonOther, R.string.tellUsHowToImprove)
             }
 
-            SearchNotGoodEnoughSubReasons.OTHER.also { type ->
-                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.tellUsHowToImprove)
+            HOME_SCREEN_CONFIGURATION.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonHomeScreenConfiguration)
+            }
+
+            TAB_DISPLAY.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonTabDisplay)
+            }
+
+            HOW_APP_LOOKS.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonAppLooks)
+            }
+
+            WHICH_DATA_IS_CLEARED.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonWhichDataIsCleared)
+            }
+
+
+            WHEN_DATA_IS_CLEARED.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonWhenDataIsCleared)
+            }
+
+
+            BOOKMARK_DISPLAY.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonBookmarksDisplay)
+            }
+
+            CustomizationSubReasons.OTHER.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonOther, R.string.tellUsHowToImprove)
+            }
+
+            SLOW_WEB_PAGE_LOADS.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.appIsSlowOrBuggySubReasonSlowResults)
+            }
+
+            APP_CRASHES_OR_FREEZES.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.appIsSlowOrBuggySubReasonAppCrashesOrFreezes)
+            }
+
+            MEDIA_PLAYBACK_BUGS.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.appIsSlowOrBuggySubReasonMediaPlayback)
+            }
+
+            PerformanceSubReasons.OTHER.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.appIsSlowOrBuggySubReasonOther, R.string.tellUsHowToImprove)
             }
         }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
index 42dbb4eacb9b..8828fd22249b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
@@ -24,19 +24,19 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment.SubReasonDisplay
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay
 import kotlinx.android.synthetic.main.item_feedback_reason.view.*
 
 
-class SubReasonAdapter(private val itemClickListener: (SubReasonDisplay) -> Unit) :
-    ListAdapter<SubReasonDisplay, SubReasonAdapter.ViewHolder>(DiffCallback()) {
+class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisplay) -> Unit) :
+    ListAdapter<FeedbackTypeSubReasonDisplay, SubReasonAdapter.ViewHolder>(DiffCallback()) {
 
-    class DiffCallback : DiffUtil.ItemCallback<SubReasonDisplay>() {
-        override fun areItemsTheSame(oldItem: SubReasonDisplay, newItem: SubReasonDisplay): Boolean {
+    class DiffCallback<T> : DiffUtil.ItemCallback<T>() {
+        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
             return oldItem == newItem
         }
 
-        override fun areContentsTheSame(oldItem: SubReasonDisplay, newItem: SubReasonDisplay): Boolean {
+        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean {
             return oldItem == newItem
         }
     }
@@ -53,8 +53,8 @@ class SubReasonAdapter(private val itemClickListener: (SubReasonDisplay) -> Unit
 
     data class ViewHolder(val root: View, val reasonTextView: TextView) : RecyclerView.ViewHolder(root) {
 
-        fun bind(reason: SubReasonDisplay, clickListener: (SubReasonDisplay) -> Unit) {
-            reasonTextView.text = reason.displayString
+        fun bind(reason: FeedbackTypeSubReasonDisplay, clickListener: (FeedbackTypeSubReasonDisplay) -> Unit) {
+            reasonTextView.text = root.context.getString(reason.listDisplayResId)
             itemView.setOnClickListener { clickListener(reason) }
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
index e4433df1e24a..a41bb3c11b62 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
@@ -28,11 +28,9 @@ import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.common.FeedbackItemDecoration
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.CustomizationSubReasons.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReasons.*
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay
 import com.duckduckgo.app.feedback.ui.negative.displayText
 import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_sub_reason.*
 import timber.log.Timber
@@ -61,21 +59,21 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val rootView = inflater.inflate(R.layout.content_feedback_negative_disambiguation_sub_reason, container, false)
 
-        recyclerAdapter = SubReasonAdapter(object : (SubReasonDisplay) -> Unit {
-            override fun invoke(reason: SubReasonDisplay) {
+        recyclerAdapter = SubReasonAdapter(object : (FeedbackTypeSubReasonDisplay) -> Unit {
+            override fun invoke(reason: FeedbackTypeSubReasonDisplay) {
                 Timber.i("Clicked reason: $reason")
-                when (reason.feedbackType) {
+                when (reason.subReason) {
                     is MissingBrowserFeaturesSubReasons -> {
-                        listener?.userSelectedSubReasonMissingBrowserFeatures(mainReason, reason.feedbackType)
+                        listener?.userSelectedSubReasonMissingBrowserFeatures(mainReason, reason.subReason)
                     }
                     is SearchNotGoodEnoughSubReasons -> {
-                        listener?.userSelectedSubReasonSearchNotGoodEnough(mainReason, reason.feedbackType)
+                        listener?.userSelectedSubReasonSearchNotGoodEnough(mainReason, reason.subReason)
                     }
                     is CustomizationSubReasons -> {
-                        listener?.userSelectedSubReasonNeedMoreCustomization(mainReason, reason.feedbackType)
+                        listener?.userSelectedSubReasonNeedMoreCustomization(mainReason, reason.subReason)
                     }
                     is PerformanceSubReasons -> {
-                        listener?.userSelectedSubReasonAppIsSlowOrBuggy(mainReason, reason.feedbackType)
+                        listener?.userSelectedSubReasonAppIsSlowOrBuggy(mainReason, reason.subReason)
                     }
                 }
             }
@@ -108,7 +106,7 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         }
     }
 
-    private fun getDisplayTextForReasonType(mainReason: MainReason): List<SubReasonDisplay> {
+    private fun getDisplayTextForReasonType(mainReason: MainReason): List<FeedbackTypeSubReasonDisplay> {
         return when (mainReason) {
             MISSING_BROWSING_FEATURES -> browserFeatureSubReasons()
             SEARCH_NOT_GOOD_ENOUGH -> searchNotGoodEnoughSubReasons()
@@ -118,59 +116,36 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         }
     }
 
-    private fun browserFeatureSubReasons(): List<SubReasonDisplay> {
-        return listOf(
-            SubReasonDisplay(NAVIGATION_ISSUES, getString(R.string.missingBrowserFeatureSubReasonNavigation)),
-            SubReasonDisplay(TAB_MANAGEMENT, getString(R.string.missingBrowserFeatureSubReasonTabManagement)),
-            SubReasonDisplay(AD_POPUP_BLOCKING, getString(R.string.missingBrowserFeatureSubReasonAdPopups)),
-            SubReasonDisplay(WATCHING_VIDEOS, getString(R.string.missingBrowserFeatureSubReasonVideos)),
-            SubReasonDisplay(INTERACTING_IMAGES, getString(R.string.missingBrowserFeatureSubReasonImages)),
-            SubReasonDisplay(BOOKMARK_MANAGEMENT, getString(R.string.missingBrowserFeatureSubReasonBookmarks)),
-            SubReasonDisplay(MissingBrowserFeaturesSubReasons.OTHER, getString(R.string.missingBrowserFeatureSubReasonOther))
-        )
+    private fun browserFeatureSubReasons(): List<FeedbackTypeSubReasonDisplay> {
+        return MissingBrowserFeaturesSubReasons.values().mapNotNull {
+            FeedbackTypeDisplay.subReasons[it]
+        }
     }
 
-    private fun searchNotGoodEnoughSubReasons(): List<SubReasonDisplay> {
-        return listOf(
-            SubReasonDisplay(PROGRAMMING_TECHNICAL_SEARCHES, getString(R.string.searchNotGoodEnoughSubReasonTechnicalSearches)),
-            SubReasonDisplay(LAYOUT_MORE_LIKE_GOOGLE, getString(R.string.searchNotGoodEnoughSubReasonGoogleLayout)),
-            SubReasonDisplay(FASTER_LOAD_TIME, getString(R.string.searchNotGoodEnoughSubReasonFasterLoadTimes)),
-            SubReasonDisplay(SEARCHING_IN_SPECIFIC_LANGUAGE, getString(R.string.searchNotGoodEnoughSubReasonSpecificLanguage)),
-            SubReasonDisplay(BETTER_AUTOCOMPLETE, getString(R.string.searchNotGoodEnoughSubReasonBetterAutocomplete)),
-            SubReasonDisplay(SearchNotGoodEnoughSubReasons.OTHER, getString(R.string.searchNotGoodEnoughSubReasonOther))
-        )
+    private fun searchNotGoodEnoughSubReasons(): List<FeedbackTypeSubReasonDisplay> {
+        return SearchNotGoodEnoughSubReasons.values().mapNotNull {
+            FeedbackTypeDisplay.subReasons[it]
+        }
     }
 
-    private fun moreCustomizationsSubReasons(): List<SubReasonDisplay> {
-        return listOf(
-            SubReasonDisplay(HOME_SCREEN_CONFIGURATION, getString(R.string.needMoreCustomizationSubReasonHomeScreenConfiguration)),
-            SubReasonDisplay(TAB_DISPLAY, getString(R.string.needMoreCustomizationSubReasonTabDisplay)),
-            SubReasonDisplay(HOW_APP_LOOKS, getString(R.string.needMoreCustomizationSubReasonAppLooks)),
-            SubReasonDisplay(WHICH_DATA_IS_CLEARED, getString(R.string.needMoreCustomizationSubReasonWhichDataIsCleared)),
-            SubReasonDisplay(WHEN_DATA_IS_CLEARED, getString(R.string.needMoreCustomizationSubReasonWhenDataIsCleared)),
-            SubReasonDisplay(BOOKMARK_DISPLAY, getString(R.string.needMoreCustomizationSubReasonBookmarksDisplay)),
-            SubReasonDisplay(SearchNotGoodEnoughSubReasons.OTHER, getString(R.string.needMoreCustomizationSubReasonOther))
-        )
+    private fun moreCustomizationsSubReasons(): List<FeedbackTypeSubReasonDisplay> {
+        return FeedbackType.CustomizationSubReasons.values().mapNotNull {
+            FeedbackTypeDisplay.subReasons[it]
+        }
     }
 
-    private fun appSlowOrBuggySubReasons(): List<SubReasonDisplay> {
-        return listOf(
-            SubReasonDisplay(SLOW_WEB_PAGE_LOADS, getString(R.string.appIsSlowOrBuggySubReasonSlowResults)),
-            SubReasonDisplay(APP_CRASHES_OR_FREEZES, getString(R.string.appIsSlowOrBuggySubReasonAppCrashesOrFreezes)),
-            SubReasonDisplay(MEDIA_PLAYBACK_BUGS, getString(R.string.appIsSlowOrBuggySubReasonMediaPlayback)),
-            SubReasonDisplay(PerformanceSubReasons.OTHER, getString(R.string.appIsSlowOrBuggySubReasonOther))
-        )
+    private fun appSlowOrBuggySubReasons(): List<FeedbackTypeSubReasonDisplay> {
+        return FeedbackType.PerformanceSubReasons.values().mapNotNull() {
+            FeedbackTypeDisplay.subReasons[it]
+        }
     }
 
-
     override fun configureViewModelObservers() {
         viewModel.command.observe(this, Observer { command ->
 
         })
     }
 
-    data class SubReasonDisplay(val feedbackType: SubReason, val displayString: String)
-
     companion object {
 
         private const val MAIN_REASON_EXTRA = "MAIN_REASON_EXTRA"
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
index d962ee52b42c..4c46c5c56060 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
@@ -109,7 +109,7 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
 
     private fun getDisplayText(reason: SubReason?): String {
         val display = subReasons[reason] ?: return getString(R.string.tellUsHowToImprove)
-        return getString(display.titleDisplayResId)
+        return getString(display.subtitleDisplayResId)
     }
 
     override fun configureListeners() {

From 4a69c2d4f7f00814587973a1f43c356912a3ee72 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 14 Mar 2019 14:24:43 +0000
Subject: [PATCH 06/47] Add broken site feedback flow

---
 .../duckduckgo/app/di/AndroidBindingModule.kt |   8 +-
 .../feedback/ui/common/FeedbackActivity.kt    |  21 ++-
 .../feedback/ui/common/FeedbackViewModel.kt   |  47 +++---
 .../BrokenSiteNegativeFeedbackFragment.kt     |  74 +++++++++
 .../BrokenSiteNegativeFeedbackViewModel.kt    |  47 ++++++
 .../MainReasonNegativeFeedbackFragment.kt     |   2 +-
 .../MainReasonNegativeFeedbackViewModel.kt    |   2 +-
 .../ShareOpenEndedNegativeFeedbackFragment.kt |  10 +-
 ...ShareOpenEndedNegativeFeedbackViewModel.kt |   1 -
 .../SubReasonAdapter.kt                       |   2 +-
 .../SubReasonNegativeFeedbackFragment.kt      |   2 +-
 .../SubReasonNegativeFeedbackViewModel.kt     |   2 +-
 .../duckduckgo/app/global/ViewModelFactory.kt |   9 +-
 ...feedback_negative_broken_site_feedback.xml | 150 ++++++++++++++++++
 ..._feedback_negative_open_ended_feedback.xml |   4 +-
 .../strings-feedback-disambiguation.xml       |   3 +
 16 files changed, 349 insertions(+), 35 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/{initial => mainreason}/MainReasonNegativeFeedbackFragment.kt (98%)
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/{initial => mainreason}/MainReasonNegativeFeedbackViewModel.kt (95%)
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/{initial => subreason}/SubReasonAdapter.kt (97%)
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/{initial => subreason}/SubReasonNegativeFeedbackFragment.kt (99%)
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/{initial => subreason}/SubReasonNegativeFeedbackViewModel.kt (95%)
 create mode 100644 app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml

diff --git a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
index 8ca7c298433b..3e23df811abf 100644
--- a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
@@ -28,9 +28,10 @@ import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
 import com.duckduckgo.app.feedback.ui.SurveyActivity
 import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.fire.FireActivity
 import com.duckduckgo.app.job.AppConfigurationJobService
@@ -154,6 +155,9 @@ abstract class AndroidBindingModule {
     @ContributesAndroidInjector
     abstract fun disambiguationNegativeFeedbackFragment(): SubReasonNegativeFeedbackFragment
 
+    @ContributesAndroidInjector
+    abstract fun brokenSiteNegativeFeedbackFragment(): BrokenSiteNegativeFeedbackFragment
+
     /* Services */
 
     @ContributesAndroidInjector
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 1f1c503228e5..cae9063fdaa6 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -27,9 +27,10 @@ import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
-import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import kotlinx.android.synthetic.main.include_toolbar.*
@@ -41,7 +42,9 @@ class FeedbackActivity : DuckDuckGoActivity(),
     PositiveFeedbackLandingFragment.PositiveFeedbackLandingListener,
     ShareOpenEndedNegativeFeedbackFragment.OpenEndedFeedbackListener,
     MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
+    BrokenSiteNegativeFeedbackFragment.BrokenSiteFeedbackListener,
     SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
+
     private val viewModel: FeedbackViewModel by bindViewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -86,6 +89,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
             is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.direction)
             is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.direction, state.mainReason)
             is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.direction, state.mainReason, state.subReason)
+            is FragmentState.NegativeWebSitesBrokenFeedback -> showNegativeWebSiteBrokenView(state.direction)
         }
     }
 
@@ -119,6 +123,11 @@ class FeedbackActivity : DuckDuckGoActivity(),
         updateFragment(fragment, direction)
     }
 
+    private fun showNegativeWebSiteBrokenView(direction: NavigationDirection) {
+        val fragment = BrokenSiteNegativeFeedbackFragment.instance()
+        updateFragment(fragment, direction)
+    }
+
     private fun updateFragment(fragment: FeedbackFragment, direction: NavigationDirection) {
         if (supportFragmentManager.findFragmentByTag(fragment.fragmentTag) != null) return
 
@@ -200,6 +209,14 @@ class FeedbackActivity : DuckDuckGoActivity(),
         viewModel.userSelectedSubReasonAppIsSlowOrBuggy(mainReason, subReason)
     }
 
+    /**
+     * Negative feedback, broken site
+     */
+    override fun onProvidedBrokenSiteFeedback(feedback: String, url: String?) {
+        Timber.w("Received broken site feedback for site: ($url): $feedback")
+        viewModel.onProvidedBrokenSiteFeedback(feedback, url)
+    }
+
     companion object {
 
         fun intent(context: Context): Intent {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 12da5fbe239e..8c336b2df44f 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -42,9 +42,25 @@ class FeedbackViewModel : ViewModel() {
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
 
-    fun onBackPressed() {
-        Timber.i("On back button press")
+    fun userSelectedNegativeFeedbackMainReason(mainReason: MainReason) {
+        val newState = when (mainReason) {
+            MainReason.MISSING_BROWSING_FEATURES -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.WEBSITES_NOT_LOADING -> NegativeWebSitesBrokenFeedback(NAVIGATION_FORWARDS, mainReason)
+            MainReason.SEARCH_NOT_GOOD_ENOUGH -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.NOT_ENOUGH_CUSTOMIZATIONS -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.APP_IS_SLOW_OR_BUGGY -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
+            MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
+        }
+        viewState.value = currentViewState.copy(
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = null,
+            previousViewState = currentViewState.fragmentViewState
+        )
+    }
+
 
+    fun onBackPressed() {
         when (currentViewState.fragmentViewState) {
             is InitialAppEnjoymentClarifier -> {
                 command.value = Command.Exit(feedbackSubmitted = false)
@@ -78,7 +94,6 @@ class FeedbackViewModel : ViewModel() {
         }
     }
 
-
     fun userSelectedPositiveFeedback() {
         viewState.value = currentViewState.copy(
             fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
@@ -111,26 +126,13 @@ class FeedbackViewModel : ViewModel() {
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
-        Timber.i("User provided positive feedback: {$feedback}")
+    fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userSelectedNegativeFeedbackMainReason(mainReason: MainReason) {
-        val newState = when (mainReason) {
-            MainReason.MISSING_BROWSING_FEATURES -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
-            MainReason.WEBSITES_NOT_LOADING -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
-            MainReason.SEARCH_NOT_GOOD_ENOUGH -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
-            MainReason.NOT_ENOUGH_CUSTOMIZATIONS -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
-            MainReason.APP_IS_SLOW_OR_BUGGY -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
-            MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
-        }
-        viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = null,
-            previousViewState = currentViewState.fragmentViewState
-        )
+    fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
+        Timber.i("User provided positive feedback: {$feedback}")
+        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     fun userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
@@ -200,6 +202,11 @@ sealed class FragmentState(open val direction: NavigationDirection) {
     data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason, val subReason: SubReason? = null) :
         FragmentState(direction)
 
+    data class NegativeWebSitesBrokenFeedback(
+        override val direction: NavigationDirection,
+        val mainReason: MainReason,
+        val subReason: SubReason? = null
+    ) : FragmentState(direction)
 }
 
 inline class NavigationDirection(val isForward: Boolean)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
new file mode 100644
index 000000000000..c73a58d8ff3a
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.brokensite
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.Observer
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import kotlinx.android.synthetic.main.content_feedback_negative_broken_site_feedback.*
+
+
+class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
+
+    override val fragmentTag: String = "Open ended negative feedback"
+
+    interface BrokenSiteFeedbackListener {
+        fun onProvidedBrokenSiteFeedback(feedback: String, url: String?)
+        fun userCancelled()
+    }
+
+    private val viewModel by bindViewModel<BrokenSiteNegativeFeedbackViewModel>()
+
+    private val listener: BrokenSiteFeedbackListener?
+        get() = activity as BrokenSiteFeedbackListener
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.content_feedback_negative_broken_site_feedback, container, false)
+    }
+
+    override fun configureViewModelObservers() {
+        viewModel.command.observe(this, Observer { command ->
+            when (command) {
+                is BrokenSiteNegativeFeedbackViewModel.Command.Exit -> {
+                    listener?.userCancelled()
+                }
+                is BrokenSiteNegativeFeedbackViewModel.Command.ExitAndSubmitFeedback -> {
+                    listener?.onProvidedBrokenSiteFeedback(command.feedback, command.brokenSite)
+                }
+            }
+        })
+    }
+
+    override fun configureListeners() {
+        submitFeedbackButton.setOnClickListener {
+            val feedback = openEndedFeedback.text.toString()
+            val brokenSite = brokenSiteInput.text.toString()
+
+            viewModel.userSubmittingFeedback(feedback, brokenSite) }
+    }
+
+    companion object {
+
+        fun instance(): BrokenSiteNegativeFeedbackFragment {
+            return BrokenSiteNegativeFeedbackFragment()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
new file mode 100644
index 000000000000..62c1ad165c04
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.brokensite
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.global.SingleLiveEvent
+
+
+class BrokenSiteNegativeFeedbackViewModel : ViewModel() {
+
+    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+
+    private val currentViewState: ViewState
+        get() = viewState.value!!
+
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+
+
+    fun userSubmittingFeedback(feedback: String, brokenSite: String?) {
+        command.value = Command.ExitAndSubmitFeedback(feedback, brokenSite)
+    }
+
+    sealed class ViewState {
+
+    }
+
+    sealed class Command {
+        data class ExitAndSubmitFeedback(val feedback: String, val brokenSite: String?) : Command()
+        object Exit : Command()
+    }
+}
+
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
similarity index 98%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
index 39b0637efc03..d67a391735fc 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.negative.initial
+package com.duckduckgo.app.feedback.ui.negative.mainreason
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
similarity index 95%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
index 7984c5c5d853..b143f6fe6f8b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/MainReasonNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.negative.initial
+package com.duckduckgo.app.feedback.ui.negative.mainreason
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
index 4c46c5c56060..00f98a4334c4 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
@@ -98,7 +98,7 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
 
         title.text = getDisplayText(mainReason)
         subtitle.text = getDisplayText(subReason)
-        openEndedFeedbackContainer.hint = getString(R.string.openEndedInputHint)
+        openEndedFeedbackContainer.hint = getInputHintText(mainReason)
         emoticonImage.setImageResource(R.drawable.ic_negative_feedback)
     }
 
@@ -112,6 +112,14 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
         return getString(display.subtitleDisplayResId)
     }
 
+    private fun getInputHintText(reason: MainReason): String {
+        return if (reason == MainReason.OTHER) {
+            getString(R.string.feedbackSpecificAsPossible)
+        } else {
+            getString(R.string.openEndedInputHint)
+        }
+    }
+
     override fun configureListeners() {
         submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString(), isPositiveFeedback) }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
index c7e59cfd1fa8..673b18d70fdd 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -30,7 +30,6 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
 
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
-
     fun userSubmittingFeedback(feedback: String, isPositiveFeedback: Boolean) {
         if (isPositiveFeedback) {
             command.value = Command.ExitAndSubmitPositiveFeedback(feedback)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
similarity index 97%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
index 8828fd22249b..3bab0d1fd053 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.negative.initial
+package com.duckduckgo.app.feedback.ui.negative.subreason
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
similarity index 99%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
index a41bb3c11b62..26f8ed93c1e2 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.negative.initial
+package com.duckduckgo.app.feedback.ui.negative.subreason
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt
similarity index 95%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt
index c9b2f144bea2..d4effde7ca72 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/initial/SubReasonNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui.negative.initial
+package com.duckduckgo.app.feedback.ui.negative.subreason
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index a95239faf40d..af4aa43a45e5 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -34,10 +34,11 @@ import com.duckduckgo.app.feedback.db.SurveyDao
 import com.duckduckgo.app.feedback.ui.SurveyViewModel
 import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel
-import com.duckduckgo.app.feedback.ui.negative.initial.MainReasonNegativeFeedbackViewModel
-import com.duckduckgo.app.feedback.ui.negative.initial.SubReasonNegativeFeedbackViewModel
-import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingViewModel
+import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackViewModel
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackViewModel
+import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingViewModel
 import com.duckduckgo.app.fire.DataClearer
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.install.AppInstallStore
@@ -124,6 +125,8 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(ShareOpenEndedNegativeFeedbackViewModel::class.java) -> ShareOpenEndedNegativeFeedbackViewModel()
                 isAssignableFrom(MainReasonNegativeFeedbackViewModel::class.java) -> MainReasonNegativeFeedbackViewModel()
                 isAssignableFrom(SubReasonNegativeFeedbackViewModel::class.java) -> SubReasonNegativeFeedbackViewModel()
+                isAssignableFrom(BrokenSiteNegativeFeedbackViewModel::class.java) -> BrokenSiteNegativeFeedbackViewModel()
+
                 else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
             }
         } as T
diff --git a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
new file mode 100644
index 000000000000..51deaf293953
--- /dev/null
+++ b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:toots="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
+
+        <ImageView
+            android:id="@+id/emoticonImage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_negative_feedback"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:fontFamily="sans-serif-medium"
+            android:text="@string/websiteNotLoadingTitleShort"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlackDark"
+            android:textSize="22sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
+
+        <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:fontFamily="sans-serif"
+            android:text="@string/whichBrokenSites"
+            android:textAlignment="center"
+            android:textColor="@color/almostBlack"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintWidth_percent="0.66" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/brokenSiteInputContainer"
+            style="@style/FeedbackInputBoxStyle"
+            android:layout_width="0dp"
+            android:layout_height="70dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="65dp"
+            android:layout_marginEnd="20dp"
+            android:hint="@string/whichBrokenSitesHint"
+            app:hintTextAppearance="@style/FeedbackInputHintStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/subtitle">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/brokenSiteInput"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no"
+                android:inputType="textUri"
+                android:paddingBottom="20dp"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp"
+                toots:text="https://example.com" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/openEndedFeedbackContainer"
+            style="@style/FeedbackInputBoxStyle"
+            android:layout_width="0dp"
+            android:layout_height="140dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="20dp"
+            android:hint="@string/openEndedInputHint"
+            app:hintTextAppearance="@style/FeedbackInputHintStyle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/brokenSiteInputContainer">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/openEndedFeedback"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/white"
+                android:nextFocusDown="@string/submitFeedback"
+                android:gravity="top"
+                android:imeOptions="flagNoExtractUi"
+                android:importantForAutofill="no"
+                android:inputType="textLongMessage|textMultiLine"
+                android:textColor="@color/greyishBrownTwo"
+                android:textSize="14sp" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <Button
+            android:id="@+id/submitFeedbackButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/button_contained_bg"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="@string/submitFeedback"
+            android:textColor="@color/white"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer"
+            app:layout_constraintVertical_bias="0.9" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
index c32c28a2ac9e..bf2c5efa23c1 100644
--- a/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
@@ -100,13 +100,15 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="78dp"
             android:layout_marginEnd="20dp"
             android:background="@drawable/button_contained_bg"
             android:foreground="?attr/selectableItemBackground"
             android:text="@string/submitFeedback"
             android:textColor="@color/white"
             android:textSize="15sp"
+            android:layout_marginBottom="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintVertical_bias="0.9"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/openEndedFeedbackContainer" />
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index f821070b47ef..9079d3e8a3f3 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -80,6 +80,9 @@
     <string name="shareTheLoveWithARating">Please share the love by rating on the Play Store</string>
     <string name="rateTheApp">RATE THE APP</string>
     <string name="declineFurtherFeedback">NO THANKS, I\'M DONE</string>
+    <string name="whichBrokenSites">Where are you seeing these issues?</string>
+    <string name="whichBrokenSitesHint">Which website has issues?</string>
+    <string name="feedbackSpecificAsPossible">Please be as specific as possible</string>
 
 
 </resources>
\ No newline at end of file

From 37899431d588d2e06de038f2d34c1852021ed906 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 14 Mar 2019 17:44:05 +0000
Subject: [PATCH 07/47] Tidy up of feedback fragment code

---
 .../feedback/ui/common/FeedbackActivity.kt    |   5 +-
 .../feedback/ui/common/FeedbackFragment.kt    |   2 -
 .../ui/common/FeedbackItemDecoration.kt       |  54 ++-----
 .../feedback/ui/common/FeedbackViewModel.kt   |   6 +-
 .../ui/initial/InitialFeedbackFragment.kt     |   5 +-
 .../InitialFeedbackFragmentViewModel.kt       |   3 -
 .../BrokenSiteNegativeFeedbackFragment.kt     |   2 -
 .../BrokenSiteNegativeFeedbackViewModel.kt    |  11 --
 .../negative/mainreason/MainReasonAdapter.kt  |  62 ++++++++
 .../MainReasonNegativeFeedbackFragment.kt     |  63 +++++---
 .../MainReasonNegativeFeedbackViewModel.kt    |  49 ------
 .../ShareOpenEndedNegativeFeedbackFragment.kt |   2 -
 ...ShareOpenEndedNegativeFeedbackViewModel.kt |  10 --
 .../SubReasonNegativeFeedbackFragment.kt      |  13 +-
 .../SubReasonNegativeFeedbackViewModel.kt     |  44 ------
 .../PositiveFeedbackLandingFragment.kt        |   5 +-
 .../PositiveFeedbackLandingViewModel.kt       |  15 --
 .../duckduckgo/app/global/ViewModelFactory.kt |   4 -
 .../res/drawable/feedback_list_divider.xml    |  16 +-
 ...ck_negative_disambiguation_main_reason.xml | 145 +++---------------
 ...ack_negative_disambiguation_sub_reason.xml |  15 +-
 app/src/main/res/values/styles.xml            |   6 +
 22 files changed, 175 insertions(+), 362 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
 delete mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index cae9063fdaa6..0b5972bfd7ab 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -129,11 +129,12 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     private fun updateFragment(fragment: FeedbackFragment, direction: NavigationDirection) {
-        if (supportFragmentManager.findFragmentByTag(fragment.fragmentTag) != null) return
+        val tag = fragment.javaClass.name
+        if (supportFragmentManager.findFragmentByTag(tag) != null) return
 
         supportFragmentManager.transaction {
             this.applyTransition(direction)
-            replace(R.id.fragmentContainer, fragment, fragment.fragmentTag)
+            replace(R.id.fragmentContainer, fragment, fragment.tag)
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
index 10aff7c0d8f9..3f92e34b9383 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
@@ -28,8 +28,6 @@ import javax.inject.Inject
 
 abstract class FeedbackFragment : Fragment() {
 
-    abstract val fragmentTag: String
-
     @Inject
     lateinit var viewModelFactory: ViewModelFactory
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
index cb53b1b049ec..6c90bde6bf74 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
@@ -17,55 +17,31 @@
 package com.duckduckgo.app.feedback.ui.common
 
 import android.graphics.Canvas
-import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.app.global.view.toPx
-import timber.log.Timber
 
-class FeedbackItemDecoration(private val divider: Drawable?) : RecyclerView.ItemDecoration() {
-
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-
-//        val position = parent.getChildAdapterPosition(view)
-//
-//        Timber.i("Deciding item decoration for item at position $position, total items = ${parent.totalItemCount()}")
-//        if (isFirstItem(position) || isLastItem(position, parent)) {
-//            Timber.i("Dealing with first or last item")
-//        } else {
-//            Timber.i("Dealing with item in the list (not top nor bottom)")
-//            outRect.left = 22.toPx()
-//        }
-    }
+class FeedbackItemDecoration(private val divider: Drawable) : RecyclerView.ItemDecoration() {
 
     override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        if (divider == null) return
-
-        val count = parent.childCount
-        val width = parent.width
-
-
-        for (i in 0 until count) {
-
-            Timber.i("Deciding item decoration for item at position $i, total items = ${parent.totalItemCount()}")
+        val childCount = parent.childCount
+        for (i in 0 until childCount) {
             val child = parent.getChildAt(i)
+
+            //val extraPadding = getPaddingStart(i, parent)
             val params = child.layoutParams as RecyclerView.LayoutParams
+            val top = child.bottom + params.bottomMargin
+            drawDividerAlongBottom(parent, top, c)
+        }
+    }
 
-            val extraLeftSpace = if(shouldAddExtraPadding(i, parent)) 22.toPx() else 0
+    private fun drawDividerAlongBottom(parent: RecyclerView, childTop: Int, c: Canvas) {
+        val left = parent.paddingLeft + 22.toPx()
+        val right = parent.width - parent.paddingRight
 
-            val dividerTop = child.bottom + params.bottomMargin
-            val dividerBottom = dividerTop + divider.intrinsicHeight
-            val dividerLeft = parent.paddingLeft
-            val dividerRight = width - parent.paddingRight
+        val bottom = childTop + divider.intrinsicHeight
 
-            divider.setBounds(dividerLeft + extraLeftSpace, dividerTop, dividerRight, dividerBottom)
-            divider.draw(c)
-        }
+        divider.setBounds(left, childTop, right, bottom)
+        divider.draw(c)
     }
-
-    private fun shouldAddExtraPadding(position:Int, parent: RecyclerView) : Boolean = isFirstItem(position)|| isLastItem(position, parent)
-    private fun isFirstItem(position: Int) = position == 0
-    private fun isLastItem(position: Int, parent: RecyclerView) = (position + 1) == parent.totalItemCount()
-    private fun RecyclerView.totalItemCount() = adapter?.itemCount
 }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 8c336b2df44f..f4f154d70f2d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -31,9 +31,10 @@ class FeedbackViewModel : ViewModel() {
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
     init {
-        viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
+        //viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
         //viewState.value = ViewState(fragmentViewState = FragmentState.PositiveShareFeedback(NAVIGATION_FORWARDS))
         //viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
+        viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackSubReason(NAVIGATION_FORWARDS, MainReason.MISSING_BROWSING_FEATURES))
     }
 
     private val currentViewState: ViewState
@@ -77,6 +78,9 @@ class FeedbackViewModel : ViewModel() {
             is NegativeFeedbackSubReason -> {
                 viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
             }
+            is NegativeWebSitesBrokenFeedback -> {
+                viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
+            }
             is NegativeOpenEndedFeedback -> {
                 val newViewState = when (currentViewState.previousViewState) {
                     is NegativeFeedbackSubReason -> {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 79ad2088e2c6..41ab951ad864 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -30,8 +30,6 @@ import timber.log.Timber
 
 class InitialFeedbackFragment : FeedbackFragment() {
 
-    override val fragmentTag: String = "Initial feedback"
-
     interface InitialFeedbackListener {
         fun userSelectedPositiveFeedback()
         fun userSelectedNegativeFeedback()
@@ -65,8 +63,7 @@ class InitialFeedbackFragment : FeedbackFragment() {
 
     companion object {
         fun instance(): InitialFeedbackFragment {
-            val fragment = InitialFeedbackFragment()
-            return fragment
+            return InitialFeedbackFragment()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
index 4b2542dd2378..39f4084ee2ed 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragmentViewModel.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.app.feedback.ui.initial
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.feedback.ui.common.ViewState
-import timber.log.Timber
 
 class InitialFeedbackFragmentViewModel : ViewModel() {
 
@@ -27,12 +26,10 @@ class InitialFeedbackFragmentViewModel : ViewModel() {
     val command: MutableLiveData<Command> = MutableLiveData()
 
     fun onPositiveFeedback() {
-        Timber.i("User is giving positive feedback")
         command.value = Command.PositiveFeedbackSelected
     }
 
     fun onNegativeFeedback() {
-        Timber.i("User is giving negative feedback")
         command.value = Command.NegativeFeedbackSelected
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
index c73a58d8ff3a..271ce5fe3205 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
@@ -28,8 +28,6 @@ import kotlinx.android.synthetic.main.content_feedback_negative_broken_site_feed
 
 class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
 
-    override val fragmentTag: String = "Open ended negative feedback"
-
     interface BrokenSiteFeedbackListener {
         fun onProvidedBrokenSiteFeedback(feedback: String, url: String?)
         fun userCancelled()
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
index 62c1ad165c04..e603100be98f 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackViewModel.kt
@@ -16,29 +16,18 @@
 
 package com.duckduckgo.app.feedback.ui.negative.brokensite
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
 
 
 class BrokenSiteNegativeFeedbackViewModel : ViewModel() {
 
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
-
     fun userSubmittingFeedback(feedback: String, brokenSite: String?) {
         command.value = Command.ExitAndSubmitFeedback(feedback, brokenSite)
     }
 
-    sealed class ViewState {
-
-    }
-
     sealed class Command {
         data class ExitAndSubmitFeedback(val feedback: String, val brokenSite: String?) : Command()
         object Exit : Command()
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
new file mode 100644
index 000000000000..bc0a8f00bba7
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.negative.mainreason
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay
+import kotlinx.android.synthetic.main.item_feedback_reason.view.*
+
+
+class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDisplay) -> Unit) :
+    ListAdapter<FeedbackTypeMainReasonDisplay, MainReasonAdapter.ViewHolder>(DiffCallback()) {
+
+    class DiffCallback<T> : DiffUtil.ItemCallback<T>() {
+        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
+            return oldItem == newItem
+        }
+
+        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean {
+            return oldItem == newItem
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        val root = inflater.inflate(R.layout.item_feedback_reason, parent, false)
+        return ViewHolder(root, root.reason)
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(getItem(position), itemClickListener)
+    }
+
+    data class ViewHolder(val root: View, val reasonTextView: TextView) : RecyclerView.ViewHolder(root) {
+
+        fun bind(reason: FeedbackTypeMainReasonDisplay, clickListener: (FeedbackTypeMainReasonDisplay) -> Unit) {
+            reasonTextView.text = root.context.getString(reason.listDisplayResId)
+            itemView.setOnClickListener { clickListener(reason) }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
index d67a391735fc..61b768f0a52a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
@@ -20,54 +20,71 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.Observer
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.common.FeedbackItemDecoration
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay
+import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay
 import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_main_reason.*
+import timber.log.Timber
 
 
 class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
-
-    override val fragmentTag: String = "Disambiguation negative feedback"
+    private lateinit var recyclerAdapter: MainReasonAdapter
 
     interface MainReasonNegativeFeedbackListener {
+
         fun userSelectedNegativeFeedbackMainReason(type: MainReason)
     }
-
-    private val viewModel by bindViewModel<MainReasonNegativeFeedbackViewModel>()
-
     private val listener: MainReasonNegativeFeedbackListener?
         get() = activity as MainReasonNegativeFeedbackListener
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.content_feedback_negative_disambiguation_main_reason, container, false)
-    }
+        val rootView = inflater.inflate(R.layout.content_feedback_negative_disambiguation_main_reason, container, false)
 
-    override fun configureViewModelObservers() {
-        viewModel.command.observe(this, Observer { command ->
-            when (command) {
-                is MainReasonNegativeFeedbackViewModel.Command.UserSelectedFeedbackType -> {
-                    listener?.userSelectedNegativeFeedbackMainReason(command.type)
-                }
+        recyclerAdapter = MainReasonAdapter(object : (FeedbackTypeMainReasonDisplay) -> Unit {
+            override fun invoke(reason: FeedbackTypeMainReasonDisplay) {
+                Timber.i("Clicked reason: $reason")
+                listener?.userSelectedNegativeFeedbackMainReason(reason.mainReason)
             }
         })
+
+        return rootView
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        activity?.let {
+            recyclerView.layoutManager = LinearLayoutManager(it)
+            recyclerView.adapter = recyclerAdapter
+            recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!))
+
+            val listValues = getMainReasonsDisplayText()
+            Timber.i("There are ${listValues.size} subReasons to show")
+            recyclerAdapter.submitList(listValues)
+        }
     }
 
-    override fun configureListeners() {
-        optionMissingFeatures.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.MISSING_BROWSING_FEATURES) }
-        optionWebsitesNotLoading.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.WEBSITES_NOT_LOADING) }
-        optionSearchNotGoodEnough.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.SEARCH_NOT_GOOD_ENOUGH) }
-        optionNotEnoughCustomizationOptions.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.NOT_ENOUGH_CUSTOMIZATIONS) }
-        optionAppIsSlowOrBuggy.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.APP_IS_SLOW_OR_BUGGY) }
-        optionNoneOfThese.setOnClickListener { viewModel.userSelectedFeedbackType(MainReason.OTHER) }
+
+    private fun getMainReasonsDisplayText(): List<FeedbackTypeMainReasonDisplay> {
+        return FeedbackType.MainReason.values().mapNotNull {
+            FeedbackTypeDisplay.mainReasons[it]
+        }
+    }
+
+    override fun configureViewModelObservers() {
+
     }
 
     companion object {
 
         fun instance(): MainReasonNegativeFeedbackFragment {
-            val fragment = MainReasonNegativeFeedbackFragment()
-            return fragment
+            return MainReasonNegativeFeedbackFragment()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
deleted file mode 100644
index b143f6fe6f8b..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackViewModel.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2019 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.feedback.ui.negative.mainreason
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
-import com.duckduckgo.app.global.SingleLiveEvent
-
-
-class MainReasonNegativeFeedbackViewModel : ViewModel() {
-
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
-    val command: SingleLiveEvent<Command> = SingleLiveEvent()
-
-
-    fun userSelectedFeedbackType(mainReason: MainReason) {
-        command.value = Command.UserSelectedFeedbackType(mainReason)
-    }
-
-    sealed class ViewState {
-
-    }
-
-    sealed class Command {
-        data class UserSelectedFeedbackType(val type: MainReason) : Command()
-    }
-
-}
-
-
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
index 00f98a4334c4..e2906249a8e9 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
@@ -33,8 +33,6 @@ import kotlinx.android.synthetic.main.content_feedback_negative_open_ended_feedb
 
 class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
 
-    override val fragmentTag: String = "Open ended negative feedback"
-
     interface OpenEndedFeedbackListener {
         fun onProvidedNegativeOpenEndedFeedback(feedback: String)
         fun onProvidedPositiveOpenEndedFeedback(feedback: String)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
index 673b18d70fdd..2e56a054c733 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -16,18 +16,12 @@
 
 package com.duckduckgo.app.feedback.ui.negative.openended
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
 
 
 class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
 
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
     fun userSubmittingFeedback(feedback: String, isPositiveFeedback: Boolean) {
@@ -38,10 +32,6 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
         }
     }
 
-    sealed class ViewState {
-
-    }
-
     sealed class Command {
         data class ExitAndSubmitNegativeFeedback(val feedback: String) : Command()
         data class ExitAndSubmitPositiveFeedback(val feedback: String) : Command()
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
index 26f8ed93c1e2..6bf67616b494 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
@@ -21,7 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
@@ -38,8 +37,6 @@ import timber.log.Timber
 
 class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
 
-    override val fragmentTag: String = "Disambiguation negative subreason feedback"
-
     private lateinit var recyclerAdapter: SubReasonAdapter
 
     interface DisambiguationNegativeFeedbackListener {
@@ -49,8 +46,6 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons)
     }
 
-    private val viewModel by bindViewModel<SubReasonNegativeFeedbackViewModel>()
-
     private val listener: DisambiguationNegativeFeedbackListener?
         get() = activity as DisambiguationNegativeFeedbackListener
 
@@ -88,7 +83,7 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         activity?.let {
             recyclerView.layoutManager = LinearLayoutManager(it)
             recyclerView.adapter = recyclerAdapter
-            recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)))
+            recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!))
 
 
             arguments?.let { args ->
@@ -140,11 +135,7 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
         }
     }
 
-    override fun configureViewModelObservers() {
-        viewModel.command.observe(this, Observer { command ->
-
-        })
-    }
+    override fun configureViewModelObservers() {}
 
     companion object {
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt
deleted file mode 100644
index d4effde7ca72..000000000000
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackViewModel.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2019 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.feedback.ui.negative.subreason
-
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.feedback.ui.negative.FeedbackType
-import com.duckduckgo.app.global.SingleLiveEvent
-
-
-class SubReasonNegativeFeedbackViewModel : ViewModel() {
-
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
-    val command: SingleLiveEvent<Command> = SingleLiveEvent()
-
-
-    sealed class ViewState {
-
-    }
-
-    sealed class Command {
-        data class NavigateNegativeOpenEndedFeedbackScreen(val type: FeedbackType) : Command()
-    }
-}
-
-
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
index f8641e80c0e3..e742413aaadd 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
@@ -31,8 +31,6 @@ import javax.inject.Inject
 
 class PositiveFeedbackLandingFragment : FeedbackFragment() {
 
-    override val fragmentTag: String = "Positive feedback landing"
-
     interface PositiveFeedbackLandingListener {
         fun userSelectedToRateApp()
         fun userSelectedToGiveFeedback()
@@ -82,8 +80,7 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
 
     companion object {
         fun instance(): PositiveFeedbackLandingFragment {
-            val fragment = PositiveFeedbackLandingFragment()
-            return fragment
+            return PositiveFeedbackLandingFragment()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
index 28df67b4f408..8c0bfb01aa40 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.feedback.ui.positive.initial
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
 import com.duckduckgo.app.playstore.PlayStoreUtils
@@ -25,11 +24,6 @@ import timber.log.Timber
 
 class PositiveFeedbackLandingViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
 
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
-
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
 
@@ -47,15 +41,6 @@ class PositiveFeedbackLandingViewModel(val playStoreUtils: PlayStoreUtils) : Vie
         Timber.i("User is cancelling")
         command.value = Command.Exit
     }
-
-}
-
-sealed class FragmentState {
-
-}
-
-sealed class ViewState {
-
 }
 
 sealed class Command {
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index af4aa43a45e5..8e0f41deeb0b 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -35,9 +35,7 @@ import com.duckduckgo.app.feedback.ui.SurveyViewModel
 import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackViewModel
-import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackViewModel
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel
-import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackViewModel
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingViewModel
 import com.duckduckgo.app.fire.DataClearer
 import com.duckduckgo.app.global.db.AppConfigurationDao
@@ -123,8 +121,6 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(InitialFeedbackFragmentViewModel::class.java) -> InitialFeedbackFragmentViewModel()
                 isAssignableFrom(PositiveFeedbackLandingViewModel::class.java) -> PositiveFeedbackLandingViewModel(playStoreUtils)
                 isAssignableFrom(ShareOpenEndedNegativeFeedbackViewModel::class.java) -> ShareOpenEndedNegativeFeedbackViewModel()
-                isAssignableFrom(MainReasonNegativeFeedbackViewModel::class.java) -> MainReasonNegativeFeedbackViewModel()
-                isAssignableFrom(SubReasonNegativeFeedbackViewModel::class.java) -> SubReasonNegativeFeedbackViewModel()
                 isAssignableFrom(BrokenSiteNegativeFeedbackViewModel::class.java) -> BrokenSiteNegativeFeedbackViewModel()
 
                 else -> throw IllegalArgumentException("Unknown ViewModel class: ${modelClass.name}")
diff --git a/app/src/main/res/drawable/feedback_list_divider.xml b/app/src/main/res/drawable/feedback_list_divider.xml
index 8a702c54a143..8aed757aa7be 100644
--- a/app/src/main/res/drawable/feedback_list_divider.xml
+++ b/app/src/main/res/drawable/feedback_list_divider.xml
@@ -14,12 +14,14 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item>
-        <shape android:shape="line">
-            <stroke android:height="2dp" android:color="#ffffff" />
-        </shape>
-    </item>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
 
-</selector>
\ No newline at end of file
+    <size
+        android:width="1dp"
+        android:height="1dp" />
+
+    <solid android:color="@color/whiteSix" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index a18abb85ca54..ac0a11dbed1f 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -64,136 +64,27 @@
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintWidth_percent="0.66" />
 
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginTop="34dp"
+        <View
+            style="@style/FeedbackListSeparator"
+            app:layout_constraintBottom_toTopOf="@id/recyclerView"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle">
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionMissingFeatures"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:foreground="?attr/selectableItemBackground"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:text="@string/missingBrowserFeaturesTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_marginStart="22dp"
-                android:layout_height="1dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionWebsitesNotLoading"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:text="@string/websiteNotLoadingTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="22dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionSearchNotGoodEnough"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:text="@string/searchNotGoodEnoughTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="22dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionNotEnoughCustomizationOptions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:text="@string/needMoreCustomizationTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="22dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionAppIsSlowOrBuggy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:text="@string/appIsSlowOrBuggyTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="22dp"
-                android:background="@color/whiteSix" />
-
-            <TextView
-                android:id="@+id/optionNoneOfThese"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/whiteFive"
-                android:gravity="center_vertical"
-                android:minHeight="50dp"
-                android:paddingStart="22dp"
-                android:paddingEnd="22dp"
-                android:text="@string/otherMainReasonTitleLong"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/whiteSix" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_marginTop="34dp"
+            app:layout_constraintTop_toBottomOf="@id/subtitle"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="wrap_content" />
 
-        </LinearLayout>
+        <View
+            style="@style/FeedbackListSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/recyclerView" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
index ecffec9f7bff..6946abd74819 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -66,6 +66,12 @@
             app:layout_constraintTop_toBottomOf="@id/title"
             app:layout_constraintWidth_percent="0.90" />
 
+        <View
+            style="@style/FeedbackListSeparator"
+            app:layout_constraintBottom_toTopOf="@id/recyclerView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
@@ -74,9 +80,14 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content" />
+
+        <View
+            style="@style/FeedbackListSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/recyclerView" />
 
-        </androidx.recyclerview.widget.RecyclerView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a59e80b4e7ef..e735dad9775b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -257,4 +257,10 @@
 
     </style>
 
+    <style name="FeedbackListSeparator">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@drawable/feedback_list_divider</item>
+    </style>
+
 </resources>
\ No newline at end of file

From 46eb96e95fc96384b2074b0435c1c4fbaf4e25a1 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 14 Mar 2019 17:49:45 +0000
Subject: [PATCH 08/47] Simplify feedback list decorator

---
 .../ui/common/FeedbackItemDecoration.kt       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
index 6c90bde6bf74..6fc313be1ff8 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackItemDecoration.kt
@@ -23,25 +23,24 @@ import com.duckduckgo.app.global.view.toPx
 
 class FeedbackItemDecoration(private val divider: Drawable) : RecyclerView.ItemDecoration() {
 
-    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+    override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
         val childCount = parent.childCount
+
+        val left = parent.paddingLeft + 22.toPx()
+        val right = parent.width - parent.paddingRight
+
         for (i in 0 until childCount) {
             val child = parent.getChildAt(i)
-
-            //val extraPadding = getPaddingStart(i, parent)
             val params = child.layoutParams as RecyclerView.LayoutParams
             val top = child.bottom + params.bottomMargin
-            drawDividerAlongBottom(parent, top, c)
+            val bottom = top + divider.intrinsicHeight
+
+            drawDividerAlongBottom(canvas, childLeft = left, childTop = top, childRight = right, childBottom = bottom)
         }
     }
 
-    private fun drawDividerAlongBottom(parent: RecyclerView, childTop: Int, c: Canvas) {
-        val left = parent.paddingLeft + 22.toPx()
-        val right = parent.width - parent.paddingRight
-
-        val bottom = childTop + divider.intrinsicHeight
-
-        divider.setBounds(left, childTop, right, bottom)
-        divider.draw(c)
+    private fun drawDividerAlongBottom(canvas: Canvas, childLeft: Int, childTop: Int, childRight: Int, childBottom: Int) {
+        divider.setBounds(childLeft, childTop, childRight, childBottom)
+        divider.draw(canvas)
     }
 }

From dd05a58e5cd1bc8e13c81fd6a4f05df3066fc828 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 15 Mar 2019 13:56:18 +0000
Subject: [PATCH 09/47] Fix tests

---
 .../app/bookmarks/db/BookmarksDaoTest.kt          |  4 ++--
 .../app/bookmarks/ui/BookmarksViewModelTest.kt    |  2 +-
 .../app/browser/BrowserTabViewModelTest.kt        |  4 ++--
 ...iewModelTest.kt => BrokenSiteViewModelTest.kt} | 15 +++++++--------
 .../duckduckgo/app/global/db/AppDatabaseTest.kt   |  6 +++---
 .../com/duckduckgo/app/global/db/AppDatabase.kt   |  2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)
 rename app/src/androidTest/java/com/duckduckgo/app/feedback/ui/{FeedbackViewModelTest.kt => BrokenSiteViewModelTest.kt} (91%)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
index aa6071e7db02..d35f7023c3a0 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt
@@ -51,7 +51,7 @@ class BookmarksDaoTest {
 
     @Test
     fun whenBookmarkDeleteThenItIsNoLongerInTheList() {
-        val bookmark = BookmarkEntity(id = 1, title = "reasonTextView", url = "www.example.com")
+        val bookmark = BookmarkEntity(id = 1, title = "title", url = "www.example.com")
         dao.insert(bookmark)
         dao.delete(bookmark)
         val list = dao.bookmarks().blockingObserve()
@@ -60,7 +60,7 @@ class BookmarksDaoTest {
 
     @Test
     fun whenBookmarkAddedThenItIsInList() {
-        val bookmark = BookmarkEntity(id = 1, title = "reasonTextView", url = "www.example.com")
+        val bookmark = BookmarkEntity(id = 1, title = "title", url = "www.example.com")
         dao.insert(bookmark)
         val list = dao.bookmarks().blockingObserve()
         assertEquals(listOf(bookmark), list)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
index 74cbd9e80293..ebbca94a3ee4 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt
@@ -47,7 +47,7 @@ class BookmarksViewModelTest {
     private val commandObserver: Observer<BookmarksViewModel.Command> = mock()
     private val bookmarksDao: BookmarksDao = mock()
 
-    private val bookmark = BookmarkEntity(title = "reasonTextView", url = "www.example.com")
+    private val bookmark = BookmarkEntity(title = "title", url = "www.example.com")
 
     private val testee: BookmarksViewModel by lazy {
         val model = BookmarksViewModel(bookmarksDao)
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
index 244f4d258e0a..44f0e67bc249 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -279,8 +279,8 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenBookmarkAddedThenDaoIsUpdatedAndUserNotified() {
-        testee.onBookmarkSaved(null, "A reasonTextView", "www.example.com")
-        verify(bookmarksDao).insert(BookmarkEntity(title = "A reasonTextView", url = "www.example.com"))
+        testee.onBookmarkSaved(null, "A title", "www.example.com")
+        verify(bookmarksDao).insert(BookmarkEntity(title = "A title", url = "www.example.com"))
         verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture())
         assertTrue(commandCaptor.lastValue is DisplayMessage)
     }
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
similarity index 91%
rename from app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt
rename to app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
index 9bbb0beeee01..5c5a376399fd 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
@@ -3,10 +3,9 @@ package com.duckduckgo.app.feedback.ui
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.InstantSchedulersRule
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel
+import com.duckduckgo.app.brokensite.BrokenSiteViewModel.Command
 import com.duckduckgo.app.feedback.api.FeedbackSender
-import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
-import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel.Command
-import com.duckduckgo.app.feedback.ui.positive.initial.Command
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
@@ -19,7 +18,7 @@ import org.junit.Test
 import org.mockito.Mock
 import org.mockito.MockitoAnnotations
 
-class FeedbackViewModelTest {
+class BrokenSiteViewModelTest {
 
     @get:Rule
     @Suppress("unused")
@@ -33,17 +32,17 @@ class FeedbackViewModelTest {
     private lateinit var mockFeedbackSender: FeedbackSender
 
     @Mock
-    private lateinit var mockCommandObserver: Observer<FeedbackViewModel.Command>
+    private lateinit var mockCommandObserver: Observer<BrokenSiteViewModel.Command>
 
-    private lateinit var testee: FeedbackViewModel
+    private lateinit var testee: BrokenSiteViewModel
 
-    private val viewState: FeedbackViewModel.ViewState
+    private val viewState: BrokenSiteViewModel.ViewState
         get() = testee.viewState.value!!
 
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
-        testee = com.duckduckgo.app.brokensite.FeedbackViewModel(mockFeedbackSender)
+        testee = com.duckduckgo.app.brokensite.BrokenSiteViewModel(mockFeedbackSender)
         testee.command.observeForever(mockCommandObserver)
     }
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
index 3641b140dd10..7392e7360428 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/global/db/AppDatabaseTest.kt
@@ -70,8 +70,8 @@ class AppDatabaseTest {
     fun whenMigratingFromVersion4To5ThenUpdatePositionsOfStoredTabs() {
 
         testHelper.createDatabase(TEST_DB_NAME, 4).use {
-            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', rreasonTextViewTextView) ")
-            it.execSQL("INSERT INTO `tabs` values ('tabid2', 'reasonTextView reasonTextView) ")
+            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', 'title') ")
+            it.execSQL("INSERT INTO `tabs` values ('tabid2', 'url', 'title') ")
         }
 
         assertEquals(0, database().tabsDao().tabs()[0].position)
@@ -82,7 +82,7 @@ class AppDatabaseTest {
     fun whenMigratingFromVersion4To5ThenTabsAreConsideredViewed() {
 
         testHelper.createDatabase(TEST_DB_NAME, 4).use {
-            it.execSQL("INSERT INTO `tabs` values ('tabreasonTextView 'url', reasonTextView) ")
+            it.execSQL("INSERT INTO `tabs` values ('tabid1', 'url', 'title') ")
         }
 
         assertTrue(database().tabsDao().tabs()[0].viewed)
diff --git a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
index b062448f581d..7fdf73441472 100644
--- a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
@@ -99,7 +99,7 @@ abstract class AppDatabase : RoomDatabase() {
     companion object {
         val MIGRATION_1_TO_2: Migration = object : Migration(1, 2) {
             override fun migrate(database: SupportSQLiteDatabase) {
-                database.execSQL("CREATE TABLE `tabs` (`tabId` TEXT NOT NULL, `url` TEXT, `reasonTextView` TEXT, PRIMARY KEY(`tabId`))")
+                database.execSQL("CREATE TABLE `tabs` (`tabId` TEXT NOT NULL, `url` TEXT, `title` TEXT, PRIMARY KEY(`tabId`))")
                 database.execSQL("CREATE INDEX `index_tabs_tabId` on `tabs` (tabId)")
                 database.execSQL("CREATE TABLE `tab_selection` (`id` INTEGER NOT NULL, `tabId` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`tabId`) REFERENCES `tabs`(`tabId`) ON UPDATE NO ACTION ON DELETE SET NULL)")
                 database.execSQL("CREATE INDEX `index_tab_selection_tabId` on `tab_selection` (tabId)")

From b59f3e6f4e6c67a7ebf9e9a45ea93642aca97d21 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 18 Mar 2019 14:01:54 +0000
Subject: [PATCH 10/47] Add dark theme

---
 app/build.gradle                              |  3 +
 .../duckduckgo/app/di/AndroidBindingModule.kt |  4 +-
 .../feedback/ui/common/FeedbackActivity.kt    | 11 ++--
 .../feedback/ui/common/FeedbackViewModel.kt   |  5 +-
 .../ui/initial/InitialFeedbackFragment.kt     |  2 -
 ...t.kt => ShareOpenEndedFeedbackFragment.kt} | 31 +++++++---
 .../app/settings/SettingsActivity.kt          |  2 -
 .../res/drawable/feedback_list_divider.xml    |  2 +-
 app/src/main/res/layout/content_feedback.xml  | 29 +++------
 ...feedback_negative_broken_site_feedback.xml | 41 +++----------
 ...ck_negative_disambiguation_main_reason.xml | 18 +-----
 ...ack_negative_disambiguation_sub_reason.xml | 17 +-----
 ... content_feedback_open_ended_feedback.xml} | 29 ++-------
 .../content_feedback_positive_landing.xml     | 44 +++++++------
 .../main/res/layout/item_feedback_reason.xml  |  6 +-
 app/src/main/res/values/attrs.xml             |  5 ++
 app/src/main/res/values/colors.xml            |  3 +
 app/src/main/res/values/dimens.xml            |  2 +-
 .../strings-feedback-disambiguation.xml       |  5 ++
 app/src/main/res/values/styles.xml            | 61 +++++++++++++++++--
 app/src/main/res/values/themes.xml            | 12 ++++
 21 files changed, 169 insertions(+), 163 deletions(-)
 rename app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/{ShareOpenEndedNegativeFeedbackFragment.kt => ShareOpenEndedFeedbackFragment.kt} (83%)
 rename app/src/main/res/layout/{content_feedback_negative_open_ended_feedback.xml => content_feedback_open_ended_feedback.xml} (76%)

diff --git a/app/build.gradle b/app/build.gradle
index 85938c5606e6..ff090d54386e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,6 +80,9 @@ android {
     androidExtensions {
         experimental = true
     }
+    kotlinOptions {
+        freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
+    }
 }
 
 ext {
diff --git a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
index 97784c868800..542b31ca94ed 100644
--- a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
@@ -30,7 +30,7 @@ import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.fire.FireActivity
@@ -147,7 +147,7 @@ abstract class AndroidBindingModule {
     abstract fun positiveFeedbackLandingFragment(): PositiveFeedbackLandingFragment
 
     @ContributesAndroidInjector
-    abstract fun shareOpenEndedPositiveFeedbackFragment(): ShareOpenEndedNegativeFeedbackFragment
+    abstract fun shareOpenEndedPositiveFeedbackFragment(): ShareOpenEndedFeedbackFragment
 
     @ContributesAndroidInjector
     abstract fun mainReasonNegativeFeedbackFragment(): MainReasonNegativeFeedbackFragment
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 0b5972bfd7ab..057c4fc69c2e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -29,7 +29,7 @@ import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.mainreason.MainReasonNegativeFeedbackFragment
-import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackFragment
+import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
@@ -40,7 +40,7 @@ import timber.log.Timber
 class FeedbackActivity : DuckDuckGoActivity(),
     InitialFeedbackFragment.InitialFeedbackListener,
     PositiveFeedbackLandingFragment.PositiveFeedbackLandingListener,
-    ShareOpenEndedNegativeFeedbackFragment.OpenEndedFeedbackListener,
+    ShareOpenEndedFeedbackFragment.OpenEndedFeedbackListener,
     MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
     BrokenSiteNegativeFeedbackFragment.BrokenSiteFeedbackListener,
     SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
@@ -94,7 +94,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     private fun showSharePositiveFeedbackView(direction: NavigationDirection) {
-        val fragment = ShareOpenEndedNegativeFeedbackFragment.instancePositiveFeedback()
+        val fragment = ShareOpenEndedFeedbackFragment.instancePositiveFeedback()
         updateFragment(fragment, direction)
     }
 
@@ -109,7 +109,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     private fun showNegativeOpenEndedFeedbackView(direction: NavigationDirection, mainReason: MainReason, subReason: SubReason? = null) {
-        val fragment = ShareOpenEndedNegativeFeedbackFragment.instanceNegativeFeedback(mainReason, subReason)
+        val fragment = ShareOpenEndedFeedbackFragment.instanceNegativeFeedback(mainReason, subReason)
         updateFragment(fragment, direction)
     }
 
@@ -221,8 +221,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
     companion object {
 
         fun intent(context: Context): Intent {
-            val intent = Intent(context, FeedbackActivity::class.java)
-            return intent
+            return Intent(context, FeedbackActivity::class.java)
         }
 
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index f4f154d70f2d..ab8a6b32274b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -31,10 +31,7 @@ class FeedbackViewModel : ViewModel() {
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
     init {
-        //viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
-        //viewState.value = ViewState(fragmentViewState = FragmentState.PositiveShareFeedback(NAVIGATION_FORWARDS))
-        //viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackMainReason(NAVIGATION_FORWARDS))
-        viewState.value = ViewState(fragmentViewState = FragmentState.NegativeFeedbackSubReason(NAVIGATION_FORWARDS, MainReason.MISSING_BROWSING_FEATURES))
+        viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
     }
 
     private val currentViewState: ViewState
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 41ab951ad864..965aba6ceccd 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -25,7 +25,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
 import kotlinx.android.synthetic.main.content_feedback.*
-import timber.log.Timber
 
 
 class InitialFeedbackFragment : FeedbackFragment() {
@@ -42,7 +41,6 @@ class InitialFeedbackFragment : FeedbackFragment() {
         get() = activity as InitialFeedbackListener
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        Timber.i("onCreateView")
         return inflater.inflate(R.layout.content_feedback, container, false)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
similarity index 83%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
rename to app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index e2906249a8e9..c99ed46fb48f 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -28,10 +28,11 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.mainReasons
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.subReasons
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
-import kotlinx.android.synthetic.main.content_feedback_negative_open_ended_feedback.*
+import kotlinx.android.synthetic.main.content_feedback_open_ended_feedback.*
+import timber.log.Timber
 
 
-class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
+class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
 
     interface OpenEndedFeedbackListener {
         fun onProvidedNegativeOpenEndedFeedback(feedback: String)
@@ -47,7 +48,7 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
     private var isPositiveFeedback: Boolean = true
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.content_feedback_negative_open_ended_feedback, container, false)
+        return inflater.inflate(R.layout.content_feedback_open_ended_feedback, container, false)
     }
 
     override fun configureViewModelObservers() {
@@ -83,6 +84,22 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        val inputState = openEndedFeedback.text.toString()
+        Timber.i("Saving view state - {$inputState}")
+        super.onSaveInstanceState(outState)
+        outState.putString("input", inputState)
+    }
+
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        Timber.i("restoring view state $savedInstanceState")
+
+        savedInstanceState?.getString("input")?.let {
+            openEndedFeedback.setText(it)
+        }
+        super.onViewStateRestored(savedInstanceState)
+    }
+
     private fun updateDisplayForPositiveFeedback() {
         title.text = getString(R.string.feedbackShareDetails)
         subtitle.text = getString(R.string.sharePositiveFeedbackWithTheTeam)
@@ -128,8 +145,8 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
         private const val SUB_REASON_EXTRA = "SUB_REASON_EXTRA"
         private const val IS_POSITIVE_FEEDBACK_EXTRA = "IS_POSITIVE_FEEDBACK_EXTRA"
 
-        fun instanceNegativeFeedback(mainReason: MainReason, subReason: SubReason?): ShareOpenEndedNegativeFeedbackFragment {
-            val fragment = ShareOpenEndedNegativeFeedbackFragment()
+        fun instanceNegativeFeedback(mainReason: MainReason, subReason: SubReason?): ShareOpenEndedFeedbackFragment {
+            val fragment = ShareOpenEndedFeedbackFragment()
             fragment.arguments = Bundle().also {
                 it.putBoolean(IS_POSITIVE_FEEDBACK_EXTRA, false)
 
@@ -142,8 +159,8 @@ class ShareOpenEndedNegativeFeedbackFragment : FeedbackFragment() {
             return fragment
         }
 
-        fun instancePositiveFeedback(): ShareOpenEndedNegativeFeedbackFragment {
-            val fragment = ShareOpenEndedNegativeFeedbackFragment()
+        fun instancePositiveFeedback(): ShareOpenEndedFeedbackFragment {
+            val fragment = ShareOpenEndedFeedbackFragment()
             fragment.arguments = Bundle().also {
                 it.putBoolean(IS_POSITIVE_FEEDBACK_EXTRA, true)
             }
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
index c444ffdfb720..38bc9371a959 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -71,8 +71,6 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
 
         configureUiEventHandlers()
         observeViewModel()
-
-        startActivityForResult(Intent(FeedbackActivity.intent(this)), FEEDBACK_RC)
     }
 
     override fun onStart() {
diff --git a/app/src/main/res/drawable/feedback_list_divider.xml b/app/src/main/res/drawable/feedback_list_divider.xml
index 8aed757aa7be..d527681d96fc 100644
--- a/app/src/main/res/drawable/feedback_list_divider.xml
+++ b/app/src/main/res/drawable/feedback_list_divider.xml
@@ -22,6 +22,6 @@
         android:width="1dp"
         android:height="1dp" />
 
-    <solid android:color="@color/whiteSix" />
+    <solid android:color="?feedbackListItemSeparatorColor" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index 4aefd88ed271..c3bf7f09fdd0 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -26,28 +26,16 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
-            android:fontFamily="sans-serif-medium"
-            android:text="Let's get started!"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
+            style="@style/FeedbackTitle.FeedbackHappySadDisambiguationTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            android:text="@string/feedbackInitialDisambiguationTitle"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="38dp"
-            android:layout_marginTop="9dp"
-            android:layout_marginEnd="38dp"
-            android:fontFamily="sans-serif"
-            android:text="How would you categorize your feedback?"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
+            style="@style/FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle"
+            android:text="@string/feedbackInitialDisambiguationSubtitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title" />
@@ -59,7 +47,7 @@
             android:layout_marginTop="34dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
-            android:contentDescription="Positive feedback button"
+            android:contentDescription="@string/feedbackInitialDisambiguationHappyButtonContentDescription"
             android:focusable="true"
             android:src="@drawable/ic_positive_feedback_button"
             app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
@@ -72,8 +60,7 @@
             android:layout_width="100dp"
             android:layout_height="100dp"
             android:background="?attr/selectableItemBackgroundBorderless"
-
-            android:contentDescription="Negative feedback button"
+            android:contentDescription="@string/feedbackInitialDisambiguationSadButtonContentDescription"
             android:src="@drawable/ic_negative_feedback_button"
             app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
             app:layout_constraintEnd_toEndOf="parent"
@@ -85,8 +72,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="26dp"
             android:fontFamily="sans-serif-medium"
-            android:text="Your anonymous feedback is important to us"
-            android:textColor="@color/warmerGray"
+            android:text="@string/feedbackIsImportantToUs"
+            android:textColor="?attr/feedbackAnonymousFeedbackLabelColor"
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
index 51deaf293953..9a8150cfe55b 100644
--- a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
@@ -38,32 +38,20 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/FeedbackTitle"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
             android:text="@string/websiteNotLoadingTitleShort"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
+            style="@style/FeedbackTitle.FeedbackSubtitle"
             android:text="@string/whichBrokenSites"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.66" />
+            app:layout_constraintTop_toBottomOf="@id/title" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/brokenSiteInputContainer"
@@ -81,16 +69,10 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/brokenSiteInput"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                style="@style/FeedbackEditTextInputStyle"
                 android:gravity="center_vertical"
-                android:imeOptions="flagNoExtractUi"
-                android:importantForAutofill="no"
-                android:inputType="textUri"
+                android:inputType="textUri|textNoSuggestions"
                 android:paddingBottom="20dp"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp"
                 toots:text="https://example.com" />
 
         </com.google.android.material.textfield.TextInputLayout>
@@ -111,17 +93,8 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/openEndedFeedback"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:nextFocusDown="@string/submitFeedback"
-                android:gravity="top"
-                android:imeOptions="flagNoExtractUi"
-                android:importantForAutofill="no"
-                android:inputType="textLongMessage|textMultiLine"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
+                style="@style/FeedbackEditTextInputStyle"
+                android:nextFocusDown="@string/submitFeedback" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index 45121775ea29..ed37be5217dc 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -37,32 +37,20 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
+            style="@style/FeedbackTitle"
             android:text="@string/feedbackNegativeMainReasonPageTitle"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/FeedbackTitle.FeedbackSubtitle"
             android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
             android:text="@string/feedbackNegativeMainReasonPageSubtitle"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.66" />
+            app:layout_constraintTop_toBottomOf="@id/title" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
index 1bd7a7986b9d..da2d9beb4d0f 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -38,13 +38,8 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
+            style="@style/FeedbackTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage"
@@ -53,18 +48,12 @@
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
             tools:text="Which XXX feature can we improve or add?"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
+            style="@style/FeedbackTitle.FeedbackSubtitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.90" />
+            app:layout_constraintTop_toBottomOf="@id/title" />
 
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
similarity index 76%
rename from app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
rename to app/src/main/res/layout/content_feedback_open_ended_feedback.xml
index bf2c5efa23c1..b977326c3fd7 100644
--- a/app/src/main/res/layout/content_feedback_negative_open_ended_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
@@ -38,13 +38,8 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
+            style="@style/FeedbackTitle"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage"
@@ -52,18 +47,12 @@
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/FeedbackTitle.FeedbackSubtitle"
             android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
             tools:text="Which feature can we improve or add?"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.66" />
+            app:layout_constraintTop_toBottomOf="@id/title" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/openEndedFeedbackContainer"
@@ -81,16 +70,8 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/openEndedFeedback"
-                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/white"
-                android:gravity="top"
-                android:imeOptions="flagNoExtractUi"
-                android:importantForAutofill="no"
-                android:inputType="textLongMessage|textMultiLine"
-                android:textColor="@color/greyishBrownTwo"
-                android:textSize="14sp" />
+                style="@style/FeedbackEditTextInputStyle"
+                android:gravity="top" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/content_feedback_positive_landing.xml b/app/src/main/res/layout/content_feedback_positive_landing.xml
index 1c295ae17228..bd77a6865509 100644
--- a/app/src/main/res/layout/content_feedback_positive_landing.xml
+++ b/app/src/main/res/layout/content_feedback_positive_landing.xml
@@ -37,48 +37,46 @@
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/FeedbackTitle"
             android:layout_marginTop="12dp"
-            android:fontFamily="sans-serif-medium"
             android:text="@string/awesomeToHear"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlackDark"
-            android:textSize="22sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/emoticonImage" />
 
         <TextView
             android:id="@+id/subtitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            style="@style/FeedbackTitle.FeedbackSubtitle"
             android:layout_marginTop="5dp"
-            android:fontFamily="sans-serif"
             android:text="@string/shareTheLoveWithARating"
-            android:textAlignment="center"
-            android:textColor="@color/almostBlack"
-            android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            app:layout_constraintWidth_percent="0.66" />
+            app:layout_constraintTop_toBottomOf="@id/title" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintGuide_percent="0.5"
+            app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
         <Button
             android:id="@+id/rateAppButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="78dp"
             android:layout_marginEnd="20dp"
             android:background="@drawable/button_contained_bg"
             android:foreground="?attr/selectableItemBackground"
             android:text="@string/rateTheApp"
             android:textColor="@color/white"
             android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/shareFeedbackButton"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/subtitle" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/guideline" />
 
 
         <Button
@@ -86,32 +84,32 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="18dp"
             android:layout_marginEnd="20dp"
+            android:layout_marginTop="18dp"
             android:background="@drawable/report_broken_site_button_outlined_bg"
             android:foreground="?attr/selectableItemBackground"
             android:text="@string/feedbackShareDetails"
             android:textColor="@color/cornflowerBlue"
             android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/rateAppButton" />
 
-
         <Button
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="18dp"
             android:layout_marginEnd="20dp"
             android:background="@null"
             android:text="@string/declineFurtherFeedback"
+            android:layout_marginTop="30dp"
             android:textColor="@color/cornflowerBlue"
             android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/shareFeedbackButton" />
+            app:layout_constraintTop_toBottomOf="@id/shareFeedbackButton"
+            app:layout_constraintEnd_toEndOf="parent" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_feedback_reason.xml b/app/src/main/res/layout/item_feedback_reason.xml
index b0e19ef2bc83..b5e031a6b01a 100644
--- a/app/src/main/res/layout/item_feedback_reason.xml
+++ b/app/src/main/res/layout/item_feedback_reason.xml
@@ -29,14 +29,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/whiteFive"
+        android:background="?attr/feedbackListItemBackgroundColor"
         android:foreground="?attr/selectableItemBackground"
         android:paddingStart="22dp"
         android:paddingEnd="22dp"
         android:gravity="center_vertical"
-        android:minHeight="50dp"
+        android:minHeight="60dp"
         tools:text="Browser features are missing or frustrating"
-        android:textColor="@color/greyishBrownTwo"
+        android:textColor="?attr/normalTextColor"
         android:textSize="14sp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3817deac8efb..93cafc0eb794 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -40,5 +40,10 @@
     <attr name="buttonOutlinedTextColor" format="color" />
     <attr name="callToActionTitleColor" format="color" />
     <attr name="callToActionSubtitleColor" format="color" />
+    <attr name="feedbackAnonymousFeedbackLabelColor" format="color" />
+    <attr name="feedbackListItemBackgroundColor" format="color" />
+    <attr name="feedbackListItemSeparatorColor" format="color" />
+    <attr name="feedbackEditTextBackgroundColor" format="color" />
+    <attr name="feedbackEditTextHintColor" format="color" />
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 95869237a0e2..244d863bcf15 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -42,6 +42,7 @@
     <color name="almostBlackDark">#222222</color>
     <color name="almostBlack">#333333</color>
 
+    <color name="charcoalGrey">#383838</color>
     <color name="grayishBrown">#494949</color>
     <color name="greyishBrownTwo">#444444</color>
     <color name="midGray">#555</color>
@@ -59,6 +60,7 @@
     <color name="subtleGrayTwo">#d8d8d8</color>
     <color name="whiteSix">#e5e5e5</color>
     <color name="pinkish_grey_two">#c0c0c0</color>
+    <color name="veryLightGray">#eaeaea</color>
 
     <color name="orange">#de5833</color>
     <color name="brickOrange">#d03a10</color>
@@ -81,5 +83,6 @@
     <color name="portGore">#2f1f51</color>
 
     <color name="translucentDark">#b000</color>
+    <color name="nearlyBlack">#343434</color>
 
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9ef233c3824d..5749fb19ab89 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -32,7 +32,7 @@
     <dimen name="feedbackCardVerticalMargin">16dp</dimen>
     <dimen name="feedbackFormFieldsMargin">16dp</dimen>
     <dimen name="feedbackCardHorizontalMargin">16dp</dimen>
-    <dimen name="feedbackTitleMarginTop">65dp</dimen>
+    <dimen name="feedbackTitleMarginTop">30dp</dimen>
 
     <dimen name="settingsItemHorizontalPadding">20dp</dimen>
 
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index 9079d3e8a3f3..c3ec225940a1 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -83,6 +83,11 @@
     <string name="whichBrokenSites">Where are you seeing these issues?</string>
     <string name="whichBrokenSitesHint">Which website has issues?</string>
     <string name="feedbackSpecificAsPossible">Please be as specific as possible</string>
+    <string name="feedbackInitialDisambiguationTitle">Let\'s get started!</string>
+    <string name="feedbackInitialDisambiguationSubtitle">How would you categorize your feedback?</string>
+    <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Positive feedback button</string>
+    <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negative feedback button</string>
+    <string name="feedbackIsImportantToUs">Your anonymous feedback is important to us</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e735dad9775b..0a9599dba5f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="BottomSheetDialog" parent="Theme.Design.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
@@ -237,8 +237,11 @@
         <item name="android:textColor">@color/cornflowerBlue</item>
     </style>
 
+
+    <style name="Theme.Bridge" parent="Theme.MaterialComponents.Light.Bridge" />
+
     <style name="FeedbackFragmentStyle" >
-        <item name="android:background">@color/whiteThree</item>
+        <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
     </style>
@@ -250,11 +253,61 @@
 
     <style name="FeedbackInputBoxStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
         <item name="boxStrokeColor">@color/cornflowerBlue</item>
-        <item name="boxBackgroundColor">@color/whiteFive</item>
+        <item name="android:textColorHint">?attr/feedbackEditTextHintColor</item>
+        <item name="boxBackgroundColor">?attr/feedbackEditTextBackgroundColor</item>
+    </style>
+
+    <style name="FeedbackEditTextInputStyle" parent="Widget.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="android:textSize">14sp</item>
+        <item name="android:imeOptions">flagNoExtractUi</item>
+        <item name="android:inputType">textLongMessage|textMultiLine</item>
+        <item name="android:importantForAutofill" tools:ignore="NewApi">no</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:gravity">top</item>
+        <item name="android:textColor">?attr/normalTextColor</item>
     </style>
 
-    <style name="Theme.Bridge" parent="Theme.MaterialComponents.Light.Bridge">
+    <style name="FeedbackTitle">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?attr/normalTextColor</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginEnd">10dp</item>
+        <item name="android:textSize">22sp</item>
+    </style>
 
+    <style name="FeedbackTitle.FeedbackSubtitle">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">12dp</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">?attr/normalTextColor</item>
+        <item name="android:textSize">15sp</item>
+    </style>
+
+    <style name="FeedbackTitle.FeedbackHappySadDisambiguationTitle">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/feedbackTitleMarginTop</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?attr/normalTextColor</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle">
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:layout_marginTop">9dp</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginEnd">10dp</item>
     </style>
 
     <style name="FeedbackListSeparator">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8d6f56b0798a..616c3f5e5f6d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -58,6 +58,12 @@
         <item name="buttonOutlinedBorderColor">@color/brownishGrayTwo</item>
         <item name="callToActionTitleColor">@color/white</item>
         <item name="callToActionSubtitleColor">@color/grayishThree</item>
+
+        <item name="feedbackAnonymousFeedbackLabelColor">@color/grayish</item>
+        <item name="feedbackListItemBackgroundColor">@color/almostBlack</item>
+        <item name="feedbackListItemSeparatorColor">@color/charcoalGrey</item>
+        <item name="feedbackEditTextBackgroundColor">@color/almostBlack</item>
+        <item name="feedbackEditTextHintColor">@color/grayish</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark" />
@@ -106,6 +112,12 @@
         <item name="buttonOutlinedBorderColor">@color/grayishThree</item>
         <item name="callToActionTitleColor">@color/almostBlack</item>
         <item name="callToActionSubtitleColor">@color/brownishGrayTwo</item>
+
+        <item name="feedbackAnonymousFeedbackLabelColor">@color/warmerGray</item>
+        <item name="feedbackListItemBackgroundColor">@color/whiteFive</item>
+        <item name="feedbackListItemSeparatorColor">@color/whiteSix</item>
+        <item name="feedbackEditTextBackgroundColor">@color/whiteFive</item>
+        <item name="feedbackEditTextHintColor">@color/warmerGray</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">

From 42fe3dbfceafa794aee8a6e2dc549b7602f94a06 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:30:01 +0000
Subject: [PATCH 11/47] Skip the positive landing screen if can't rate; add
 dark theme buttons

---
 .../rating/InitialPromptTypeDeciderTest.kt    |  7 ++-
 .../duckduckgo/app/browser/BrowserActivity.kt |  2 +-
 .../app/browser/rating/di/RatingModule.kt     |  4 +-
 .../feedback/ui/common/FeedbackViewModel.kt   | 44 ++++++++++++++---
 .../ui/initial/InitialFeedbackFragment.kt     | 18 +++++++
 .../PositiveFeedbackLandingFragment.kt        |  3 +-
 .../PositiveFeedbackLandingViewModel.kt       |  6 +--
 .../duckduckgo/app/global/ViewModelFactory.kt |  4 +-
 .../app/global/rating/PromptTypeDecider.kt    |  4 +-
 .../app/playstore/PlayStoreUtils.kt           | 18 +++----
 .../ic_negative_feedback_button_dark.xml      | 48 +++++++++++++++++++
 .../ic_positive_feedback_button_dark.xml      | 44 +++++++++++++++++
 12 files changed, 171 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
 create mode 100644 app/src/main/res/drawable/ic_positive_feedback_button_dark.xml

diff --git a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt
index 35a2ddfcf096..bded3203b9d0 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/global/rating/InitialPromptTypeDeciderTest.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.app.global.rating
 import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.playstore.PlayStoreUtils
 import com.duckduckgo.app.usage.search.SearchCountDao
-import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.runBlocking
@@ -49,14 +48,14 @@ class InitialPromptTypeDeciderTest {
             InstrumentationRegistry.getInstrumentation().targetContext
         )
 
-        whenever(mockPlayStoreUtils.isPlayStoreInstalled(any())).thenReturn(true)
-        whenever(mockPlayStoreUtils.installedFromPlayStore(any())).thenReturn(true)
+        whenever(mockPlayStoreUtils.isPlayStoreInstalled()).thenReturn(true)
+        whenever(mockPlayStoreUtils.installedFromPlayStore()).thenReturn(true)
         whenever(mockSearchCountDao.getSearchesMade()).thenReturn(Long.MAX_VALUE)
     }
 
     @Test
     fun whenPlayNotInstalledThenNoPromptShown() = runBlocking<Unit> {
-        whenever(mockPlayStoreUtils.isPlayStoreInstalled(any())).thenReturn(false)
+        whenever(mockPlayStoreUtils.isPlayStoreInstalled()).thenReturn(false)
         assertPromptNotShown(testee.determineInitialPromptType())
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
index 1f08d08b2928..362235dad77e 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
@@ -363,7 +363,7 @@ class BrowserActivity : DuckDuckGoActivity() {
     }
 
     private fun launchPlayStore() {
-        playStoreUtils.launchPlayStore(this)
+        playStoreUtils.launchPlayStore()
     }
 
     private data class CombinedInstanceState(val originalInstanceState: Bundle?, val newInstanceState: Bundle?)
diff --git a/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt b/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt
index 7e6656de5608..4da7b4a49636 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/rating/di/RatingModule.kt
@@ -71,8 +71,8 @@ class RatingModule {
     }
 
     @Provides
-    fun playStoreUtils(): PlayStoreUtils {
-        return PlayStoreAndroidUtils()
+    fun playStoreUtils(context: Context): PlayStoreUtils {
+        return PlayStoreAndroidUtils(context)
     }
 
     @Singleton
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index ab8a6b32274b..17e8e4b0c1b7 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -18,15 +18,17 @@ package com.duckduckgo.app.feedback.ui.common
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
+import com.duckduckgo.app.playstore.PlayStoreUtils
 import timber.log.Timber
 
 
-class FeedbackViewModel : ViewModel() {
+class FeedbackViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
@@ -67,7 +69,11 @@ class FeedbackViewModel : ViewModel() {
                 viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
             }
             is PositiveShareFeedback -> {
-                viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_BACKWARDS))
+                if (canShowRatingsButton()) {
+                    viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_BACKWARDS))
+                } else {
+                    viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+                }
             }
             is NegativeFeedbackMainReason -> {
                 viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
@@ -96,10 +102,36 @@ class FeedbackViewModel : ViewModel() {
     }
 
     fun userSelectedPositiveFeedback() {
-        viewState.value = currentViewState.copy(
-            fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
-            previousViewState = currentViewState.fragmentViewState
-        )
+        viewState.value = if (canShowRatingsButton()) {
+            currentViewState.copy(
+                fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
+                previousViewState = currentViewState.fragmentViewState
+            )
+        } else {
+            currentViewState.copy(
+                fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+                previousViewState = currentViewState.fragmentViewState
+            )
+        }
+    }
+
+    private fun canShowRatingsButton(): Boolean {
+        val playStoreInstalled = playStoreUtils.isPlayStoreInstalled()
+
+        if (!playStoreInstalled) {
+            Timber.i("Play Store not installed")
+            return false
+        }
+
+        if (playStoreUtils.installedFromPlayStore()) {
+            return true
+        }
+
+        if (BuildConfig.DEBUG) {
+            Timber.i("Not installed from the Play Store but it is DEBUG; will treat as if installed from Play Store")
+            return true
+        }
+        return false
     }
 
     fun userSelectedNegativeFeedback() {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 965aba6ceccd..8695bef9673c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -24,11 +24,17 @@ import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
+import com.duckduckgo.app.global.DuckDuckGoTheme
+import com.duckduckgo.app.settings.db.SettingsDataStore
 import kotlinx.android.synthetic.main.content_feedback.*
+import javax.inject.Inject
 
 
 class InitialFeedbackFragment : FeedbackFragment() {
 
+    @Inject
+    lateinit var settingsDataStore: SettingsDataStore
+
     interface InitialFeedbackListener {
         fun userSelectedPositiveFeedback()
         fun userSelectedNegativeFeedback()
@@ -44,6 +50,18 @@ class InitialFeedbackFragment : FeedbackFragment() {
         return inflater.inflate(R.layout.content_feedback, container, false)
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        if (settingsDataStore.theme == DuckDuckGoTheme.LIGHT) {
+            positiveFeedbackButton.setImageResource(R.drawable.ic_positive_feedback_button)
+            negativeFeedbackButton.setImageResource(R.drawable.ic_negative_feedback_button)
+        } else {
+            positiveFeedbackButton.setImageResource(R.drawable.ic_positive_feedback_button_dark)
+            negativeFeedbackButton.setImageResource(R.drawable.ic_negative_feedback_button_dark)
+        }
+    }
+
     override fun configureViewModelObservers() {
         viewModel.command.observe(this, Observer {
             when (it) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
index e742413aaadd..d4d6d5c71d0d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
@@ -74,8 +74,7 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
     }
 
     private fun launchPlayStore() {
-        val context = activity ?: return
-        playStoreUtils.launchPlayStore(context)
+        playStoreUtils.launchPlayStore()
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
index 8c0bfb01aa40..68bd03b678e0 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
@@ -18,15 +18,13 @@ package com.duckduckgo.app.feedback.ui.positive.initial
 
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
-import com.duckduckgo.app.playstore.PlayStoreUtils
 import timber.log.Timber
 
 
-class PositiveFeedbackLandingViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
+class PositiveFeedbackLandingViewModel : ViewModel() {
 
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
-
     fun userSelectedToRateApp() {
         Timber.i("User selected to rate app")
         command.value = Command.LaunchPlayStore
@@ -43,6 +41,8 @@ class PositiveFeedbackLandingViewModel(val playStoreUtils: PlayStoreUtils) : Vie
     }
 }
 
+data class ViewState(val canShowRatingButton: Boolean)
+
 sealed class Command {
     object LaunchPlayStore : Command()
     object Exit : Command()
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 26bc3fa2e1ce..8d32d685e9a0 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -112,14 +112,14 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(ScorecardViewModel::class.java) -> ScorecardViewModel(privacySettingsStore)
                 isAssignableFrom(TrackerNetworksViewModel::class.java) -> TrackerNetworksViewModel()
                 isAssignableFrom(PrivacyPracticesViewModel::class.java) -> PrivacyPracticesViewModel()
-                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel()
+                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(playStoreUtils)
                 isAssignableFrom(BrokenSiteViewModel::class.java) -> BrokenSiteViewModel(feedbackSender)
                 isAssignableFrom(SurveyViewModel::class.java) -> SurveyViewModel(surveyDao, statisticsStore, appInstallStore)
                 isAssignableFrom(AddWidgetInstructionsViewModel::class.java) -> AddWidgetInstructionsViewModel()
                 isAssignableFrom(SettingsViewModel::class.java) -> settingsViewModel()
                 isAssignableFrom(BookmarksViewModel::class.java) -> BookmarksViewModel(bookmarksDao)
                 isAssignableFrom(InitialFeedbackFragmentViewModel::class.java) -> InitialFeedbackFragmentViewModel()
-                isAssignableFrom(PositiveFeedbackLandingViewModel::class.java) -> PositiveFeedbackLandingViewModel(playStoreUtils)
+                isAssignableFrom(PositiveFeedbackLandingViewModel::class.java) -> PositiveFeedbackLandingViewModel()
                 isAssignableFrom(ShareOpenEndedNegativeFeedbackViewModel::class.java) -> ShareOpenEndedNegativeFeedbackViewModel()
                 isAssignableFrom(BrokenSiteNegativeFeedbackViewModel::class.java) -> BrokenSiteNegativeFeedbackViewModel()
 
diff --git a/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt b/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt
index cc6cb4d253f2..1d4dbf78038a 100644
--- a/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/rating/PromptTypeDecider.kt
@@ -62,7 +62,7 @@ class InitialPromptTypeDecider(
     }
 
     private fun isPlayStoreInstalled(): Boolean {
-        if (!playStoreUtils.isPlayStoreInstalled(context)) {
+        if (!playStoreUtils.isPlayStoreInstalled()) {
             Timber.i("Play Store is not installed; cannot show ratings app enjoyment prompts")
             return false
         }
@@ -70,7 +70,7 @@ class InitialPromptTypeDecider(
     }
 
     private fun wasInstalledThroughPlayStore(): Boolean {
-        if (!playStoreUtils.installedFromPlayStore(context)) {
+        if (!playStoreUtils.installedFromPlayStore()) {
             Timber.i("DuckDuckGo was not installed from Play Store")
 
             return if (BuildConfig.DEBUG) {
diff --git a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
index ca00e90bf803..fc12e45ff273 100644
--- a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
+++ b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
@@ -25,14 +25,14 @@ import timber.log.Timber
 
 interface PlayStoreUtils {
 
-    fun installedFromPlayStore(context: Context): Boolean
-    fun launchPlayStore(context: Context)
-    fun isPlayStoreInstalled(context: Context): Boolean
+    fun installedFromPlayStore(): Boolean
+    fun launchPlayStore()
+    fun isPlayStoreInstalled(): Boolean
 }
 
-class PlayStoreAndroidUtils : PlayStoreUtils {
+class PlayStoreAndroidUtils(val context: Context) : PlayStoreUtils {
 
-    override fun installedFromPlayStore(context: Context): Boolean {
+    override fun installedFromPlayStore(): Boolean {
         return try {
             val installSource = context.packageManager.getInstallerPackageName(DDG_APP_PACKAGE)
             return matchesPlayStoreInstallSource(installSource)
@@ -47,7 +47,7 @@ class PlayStoreAndroidUtils : PlayStoreUtils {
         return installSource == PLAY_STORE_PACKAGE
     }
 
-    override fun isPlayStoreInstalled(context: Context): Boolean {
+    override fun isPlayStoreInstalled(): Boolean {
         return try {
 
             if (!isPlayStoreActivityResolvable(context)) {
@@ -55,7 +55,7 @@ class PlayStoreAndroidUtils : PlayStoreUtils {
                 return false
             }
 
-            val isAppEnabled = isPlayStoreAppEnabled(context)
+            val isAppEnabled = isPlayStoreAppEnabled()
             Timber.i("The Play Store app is installed " + if (isAppEnabled) "and enabled" else "but disabled")
             return isAppEnabled
 
@@ -65,7 +65,7 @@ class PlayStoreAndroidUtils : PlayStoreUtils {
         }
     }
 
-    private fun isPlayStoreAppEnabled(context: Context): Boolean {
+    private fun isPlayStoreAppEnabled(): Boolean {
         context.packageManager.getPackageInfo(PLAY_STORE_PACKAGE, 0)
         val appInfo = context.packageManager.getApplicationInfo(PLAY_STORE_PACKAGE, 0)
         return appInfo.enabled
@@ -82,7 +82,7 @@ class PlayStoreAndroidUtils : PlayStoreUtils {
         }
     }
 
-    override fun launchPlayStore(context: Context) {
+    override fun launchPlayStore() {
         val intent = playStoreIntent()
         try {
             context.startActivity(intent)
diff --git a/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml b/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
new file mode 100644
index 000000000000..2a7e2be86ec5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
@@ -0,0 +1,48 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="110"
+    android:viewportHeight="110">
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z" />
+    <path
+        android:fillColor="#444444"
+        android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeWidth=".5"
+        android:strokeColor="#E6E5E6" />
+    <path
+        android:fillColor="#FFB652"
+        android:fillType="evenOdd"
+        android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0" />
+    <path
+        android:fillColor="#733321"
+        android:fillType="evenOdd"
+        android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z" />
+    <path
+        android:fillColor="#F1A031"
+        android:fillType="evenOdd"
+        android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z" />
+    <path
+        android:fillColor="#733321"
+        android:fillType="evenOdd"
+        android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml b/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml
new file mode 100644
index 000000000000..dc1afa2b0794
--- /dev/null
+++ b/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml
@@ -0,0 +1,44 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="110"
+    android:viewportHeight="110">
+    <path
+        android:fillColor="#444444"
+        android:fillType="evenOdd"
+        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
+        android:strokeWidth=".5"
+        android:strokeColor="#E6E5E6" />
+    <path
+        android:fillColor="#FFB652"
+        android:fillType="evenOdd"
+        android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0" />
+    <path
+        android:fillColor="#733321"
+        android:fillType="evenOdd"
+        android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z" />
+    <path
+        android:fillColor="#F1A031"
+        android:fillType="evenOdd"
+        android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z" />
+    <path
+        android:fillColor="#733321"
+        android:fillType="evenOdd"
+        android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z" />
+</vector>

From 7bd28f6378349ec10fa2a103fa1ef8cf725e65b3 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Tue, 19 Mar 2019 17:11:15 +0000
Subject: [PATCH 12/47] UI polish after design review

---
 .../ui/initial/InitialFeedbackFragment.kt     |  8 ++--
 .../drawable/ic_button_happy_dark_theme.xml   | 25 ++++++++++
 .../drawable/ic_button_happy_light_theme.xml  | 25 ++++++++++
 .../res/drawable/ic_button_sad_dark_theme.xml | 25 ++++++++++
 .../drawable/ic_button_sad_light_theme.xml    | 25 ++++++++++
 .../drawable/ic_negative_feedback_button.xml  | 27 -----------
 .../ic_negative_feedback_button_dark.xml      | 48 -------------------
 .../drawable/ic_positive_feedback_button.xml  | 27 -----------
 .../ic_positive_feedback_button_dark.xml      | 44 -----------------
 app/src/main/res/layout/content_feedback.xml  |  8 ++--
 .../main/res/layout/item_feedback_reason.xml  |  2 +-
 .../strings-feedback-disambiguation.xml       | 20 ++++----
 app/src/main/res/values/styles.xml            |  7 +--
 13 files changed, 121 insertions(+), 170 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_button_happy_dark_theme.xml
 create mode 100644 app/src/main/res/drawable/ic_button_happy_light_theme.xml
 create mode 100644 app/src/main/res/drawable/ic_button_sad_dark_theme.xml
 create mode 100644 app/src/main/res/drawable/ic_button_sad_light_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_negative_feedback_button.xml
 delete mode 100644 app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
 delete mode 100644 app/src/main/res/drawable/ic_positive_feedback_button.xml
 delete mode 100644 app/src/main/res/drawable/ic_positive_feedback_button_dark.xml

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 8695bef9673c..6aef7cfacdb6 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -54,11 +54,11 @@ class InitialFeedbackFragment : FeedbackFragment() {
         super.onActivityCreated(savedInstanceState)
 
         if (settingsDataStore.theme == DuckDuckGoTheme.LIGHT) {
-            positiveFeedbackButton.setImageResource(R.drawable.ic_positive_feedback_button)
-            negativeFeedbackButton.setImageResource(R.drawable.ic_negative_feedback_button)
+            positiveFeedbackButton.setImageResource(R.drawable.ic_button_happy_light_theme)
+            negativeFeedbackButton.setImageResource(R.drawable.ic_button_sad_light_theme)
         } else {
-            positiveFeedbackButton.setImageResource(R.drawable.ic_positive_feedback_button_dark)
-            negativeFeedbackButton.setImageResource(R.drawable.ic_negative_feedback_button_dark)
+            positiveFeedbackButton.setImageResource(R.drawable.ic_button_happy_dark_theme)
+            negativeFeedbackButton.setImageResource(R.drawable.ic_button_sad_dark_theme)
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_button_happy_dark_theme.xml b/app/src/main/res/drawable/ic_button_happy_dark_theme.xml
new file mode 100644
index 000000000000..4eab541bb5aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_button_happy_dark_theme.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#333" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,64.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_button_happy_light_theme.xml b/app/src/main/res/drawable/ic_button_happy_light_theme.xml
new file mode 100644
index 000000000000..a93467835666
--- /dev/null
+++ b/app/src/main/res/drawable/ic_button_happy_light_theme.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,64.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_button_sad_dark_theme.xml b/app/src/main/res/drawable/ic_button_sad_dark_theme.xml
new file mode 100644
index 000000000000..ee587ae59948
--- /dev/null
+++ b/app/src/main/res/drawable/ic_button_sad_dark_theme.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#333" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,57.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_button_sad_light_theme.xml b/app/src/main/res/drawable/ic_button_sad_light_theme.xml
new file mode 100644
index 000000000000..91ae4565ece8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_button_sad_light_theme.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2019 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.
+  -->
+
+<vector android:height="24dp" android:viewportHeight="108"
+    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
+    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
+    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
+    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,57.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_negative_feedback_button.xml b/app/src/main/res/drawable/ic_negative_feedback_button.xml
deleted file mode 100644
index 0a296e9a5692..000000000000
--- a/app/src/main/res/drawable/ic_negative_feedback_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="110"
-    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml b/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
deleted file mode 100644
index 2a7e2be86ec5..000000000000
--- a/app/src/main/res/drawable/ic_negative_feedback_button_dark.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="110"
-    android:viewportHeight="110">
-    <path
-        android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z" />
-    <path
-        android:fillColor="#444444"
-        android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeWidth=".5"
-        android:strokeColor="#E6E5E6" />
-    <path
-        android:fillColor="#FFB652"
-        android:fillType="evenOdd"
-        android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0" />
-    <path
-        android:fillColor="#733321"
-        android:fillType="evenOdd"
-        android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z" />
-    <path
-        android:fillColor="#F1A031"
-        android:fillType="evenOdd"
-        android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z" />
-    <path
-        android:fillColor="#733321"
-        android:fillType="evenOdd"
-        android:pathData="M55,60c4.4,0 8.5,1.3 11.2,3.4 0.9,0.7 1,1.9 0.3,2.8 -0.7,0.9 -1.9,1 -2.8,0.3 -2,-1.6 -5.3,-2.6 -8.8,-2.6 -3.5,0 -6.7,1 -8.8,2.6 -0.9,0.7 -2.1,0.5 -2.8,-0.3 -0.7,-0.9 -0.5,-2.1 0.3,-2.8 2.9,-2.1 7,-3.4 11.4,-3.4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback_button.xml b/app/src/main/res/drawable/ic_positive_feedback_button.xml
deleted file mode 100644
index 509a279753cc..000000000000
--- a/app/src/main/res/drawable/ic_positive_feedback_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="110"
-    android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M17,3L93,3A12,12 0,0 1,105 15L105,91A12,12 0,0 1,93 103L17,103A12,12 0,0 1,5 91L5,15A12,12 0,0 1,17 3z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeColor="#E6E5E6" android:strokeWidth=".5"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml b/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml
deleted file mode 100644
index dc1afa2b0794..000000000000
--- a/app/src/main/res/drawable/ic_positive_feedback_button_dark.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="110"
-    android:viewportHeight="110">
-    <path
-        android:fillColor="#444444"
-        android:fillType="evenOdd"
-        android:pathData="M16.75,2.75L93.25,2.75A12,12 0,0 1,105.25 14.75L105.25,91.25A12,12 0,0 1,93.25 103.25L16.75,103.25A12,12 0,0 1,4.75 91.25L4.75,14.75A12,12 0,0 1,16.75 2.75z"
-        android:strokeWidth=".5"
-        android:strokeColor="#E6E5E6" />
-    <path
-        android:fillColor="#FFB652"
-        android:fillType="evenOdd"
-        android:pathData="M55,53m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0" />
-    <path
-        android:fillColor="#733321"
-        android:fillType="evenOdd"
-        android:pathData="M67,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3zM43,51c1.7,0 3,-1.3 3,-3s-1.3,-3 -3,-3 -3,1.3 -3,3 1.3,3 3,3z" />
-    <path
-        android:fillColor="#F1A031"
-        android:fillType="evenOdd"
-        android:pathData="M72.4,28.6C75.9,33.5 78,39.5 78,46c0,16.6 -13.4,30 -30,30 -6.5,0 -12.5,-2.1 -17.4,-5.6C36,78 44.9,83 55,83c16.6,0 30,-13.4 30,-30 0,-10.1 -5,-19 -12.6,-24.4z" />
-    <path
-        android:fillColor="#733321"
-        android:fillType="evenOdd"
-        android:pathData="M55,69c-4.4,0 -8.5,-1.3 -11.2,-3.4 -0.9,-0.7 -1,-1.9 -0.3,-2.8 0.7,-0.9 1.9,-1 2.8,-0.3 2,1.6 5.3,2.6 8.8,2.6 3.5,0 6.7,-1 8.8,-2.6 0.9,-0.7 2.1,-0.5 2.8,0.3 0.7,0.9 0.5,2.1 -0.3,2.8 -2.9,2.1 -7,3.4 -11.4,3.4z" />
-</vector>
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index c3bf7f09fdd0..4fd4835b0d9b 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -20,6 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
@@ -49,9 +50,9 @@
             android:clickable="true"
             android:contentDescription="@string/feedbackInitialDisambiguationHappyButtonContentDescription"
             android:focusable="true"
-            android:src="@drawable/ic_positive_feedback_button"
+            tools:src="@drawable/ic_button_happy_light_theme"
             app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
-            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/subtitle" />
 
@@ -61,7 +62,8 @@
             android:layout_height="100dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/feedbackInitialDisambiguationSadButtonContentDescription"
-            android:src="@drawable/ic_negative_feedback_button"
+            tools:src="@drawable/ic_button_sad_light_theme"
+            android:layout_marginStart="28dp"
             app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/positiveFeedbackButton"
diff --git a/app/src/main/res/layout/item_feedback_reason.xml b/app/src/main/res/layout/item_feedback_reason.xml
index b5e031a6b01a..353cfc823e8a 100644
--- a/app/src/main/res/layout/item_feedback_reason.xml
+++ b/app/src/main/res/layout/item_feedback_reason.xml
@@ -37,6 +37,6 @@
         android:minHeight="60dp"
         tools:text="Browser features are missing or frustrating"
         android:textColor="?attr/normalTextColor"
-        android:textSize="14sp" />
+        android:textSize="15sp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index c3ec225940a1..3699fe0cb145 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <string name="missingBrowserFeaturesTitleLong">Browser features are missing or frustrating</string>
-    <string name="missingBrowserFeaturesTitleShort">Browser feature issues</string>
+    <string name="missingBrowserFeaturesTitleShort">Browser Feature Issues</string>
     <string name="missingBrowserFeaturesSubtitle">Which browsing feature can we add or improve?</string>
     <string name="missingBrowserFeatureSubReasonNavigation">Navigating forward, backward, refreshing</string>
     <string name="missingBrowserFeatureSubReasonTabManagement">Creating and managing tabs</string>
@@ -28,11 +28,11 @@
     <string name="missingBrowserFeatureSubReasonOther">None of these</string>
 
     <string name="websiteNotLoadingTitleLong">Certainly websites don\'t load correctly</string>
-    <string name="websiteNotLoadingTitleShort">Website loading issues</string>
+    <string name="websiteNotLoadingTitleShort">Website Loading Issues</string>
     <string name="websiteNotLoadingSubtitle">Which website is broken?"</string>
 
     <string name="searchNotGoodEnoughTitleLong">DuckDuckGo search isn\'t good enough</string>
-    <string name="searchNotGoodEnoughTitleShort">DuckDuckGo search issues</string>
+    <string name="searchNotGoodEnoughTitleShort">DuckDuckGo Search Issues</string>
     <string name="searchNotGoodEnoughSubtitle">Which search feature can we add or improve?</string>
     <string name="searchNotGoodEnoughSubReasonTechnicalSearches">Programming/technical search</string>
     <string name="searchNotGoodEnoughSubReasonGoogleLayout">The layout should be more like Google</string>
@@ -42,7 +42,7 @@
     <string name="searchNotGoodEnoughSubReasonOther">None of these</string>
 
     <string name="needMoreCustomizationTitleLong">There aren\'t enough ways to customize the app</string>
-    <string name="needMoreCustomizationTitleShort">Customization issues</string>
+    <string name="needMoreCustomizationTitleShort">Customization Issues</string>
     <string name="needMoreCustomizationSubtitle">Which customization option can we add or improve?</string>
     <string name="needMoreCustomizationSubReasonHomeScreenConfiguration">The home screen configuration</string>
     <string name="needMoreCustomizationSubReasonTabDisplay">How tabs are displayed</string>
@@ -53,7 +53,7 @@
     <string name="needMoreCustomizationSubReasonOther">None of these</string>
 
     <string name="appIsSlowOrBuggyTitleLong">The app is slow, buggy, or crashes</string>
-    <string name="appIsSlowOrBuggyTitleShort">Performance issues</string>
+    <string name="appIsSlowOrBuggyTitleShort">Performance Issues</string>
     <string name="appIsSlowOrBuggySubtitle">Which issue are you experiencing?</string>
     <string name="appIsSlowOrBuggySubReasonSlowResults">Web pages or search results load slowly</string>
     <string name="appIsSlowOrBuggySubReasonAppCrashesOrFreezes">The app crashes or freezes</string>
@@ -61,7 +61,7 @@
     <string name="appIsSlowOrBuggySubReasonOther">None of these</string>
 
     <string name="otherMainReasonTitleLong">None of these</string>
-    <string name="otherMainReasonTitleShort">Other issues</string>
+    <string name="otherMainReasonTitleShort">Other Issues</string>
     <string name="otherMainReasonSubtitle">@string/tellUsHowToImprove</string>
 
     <string name="openEndedInputHint">How can we improve? (Optional)</string>
@@ -69,15 +69,15 @@
     <string name="appreciateYourFeedback">We appreciate your feedback</string>
     <string name="anonymousFeedbackIsImportant">Your anonymous feedback is important to us</string>
 
-    <string name="tellUsHowToImprove">Please tell us what we can improve</string>
+    <string name="tellUsHowToImprove">Please tell us what we can improve.</string>
     <string name="thanksForTheFeedback">Thanks for the feedback!</string>
     <string name="feedbackNegativeMainReasonPageSubtitle">What is your frustration most related to?</string>
-    <string name="feedbackNegativeMainReasonPageTitle">We\'re sorry to hear that</string>
+    <string name="feedbackNegativeMainReasonPageTitle">We\'re sorry to hear that.</string>
     <string name="feedbackShareDetails">Share details</string>
     <string name="sharePositiveFeedbackWithTheTeam">Are there any details you\'d like to share with the team?</string>
     <string name="whatHaveYouBeenEnjoying">What have you been enjoying?</string>
     <string name="awesomeToHear">Awesome to hear!</string>
-    <string name="shareTheLoveWithARating">Please share the love by rating on the Play Store</string>
+    <string name="shareTheLoveWithARating">Please share the love by rating on the Play Store.</string>
     <string name="rateTheApp">RATE THE APP</string>
     <string name="declineFurtherFeedback">NO THANKS, I\'M DONE</string>
     <string name="whichBrokenSites">Where are you seeing these issues?</string>
@@ -87,7 +87,7 @@
     <string name="feedbackInitialDisambiguationSubtitle">How would you categorize your feedback?</string>
     <string name="feedbackInitialDisambiguationHappyButtonContentDescription">Positive feedback button</string>
     <string name="feedbackInitialDisambiguationSadButtonContentDescription">Negative feedback button</string>
-    <string name="feedbackIsImportantToUs">Your anonymous feedback is important to us</string>
+    <string name="feedbackIsImportantToUs">Your anonymous feedback is important to us.</string>
 
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0a9599dba5f2..0e20db7c9bc4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -273,7 +273,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">12dp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/normalTextColor</item>
         <item name="android:layout_marginStart">10dp</item>
@@ -286,7 +286,6 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">12dp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">?attr/normalTextColor</item>
         <item name="android:textSize">15sp</item>
@@ -296,15 +295,11 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">@dimen/feedbackTitleMarginTop</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/normalTextColor</item>
-        <item name="android:textSize">20sp</item>
     </style>
 
     <style name="FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle">
         <item name="android:textStyle">normal</item>
-        <item name="android:textSize">15sp</item>
         <item name="android:layout_marginTop">9dp</item>
         <item name="android:layout_marginStart">10dp</item>
         <item name="android:layout_marginEnd">10dp</item>

From 312525e402048e8b3fa6fa477b8365c5baf84165 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 20 Mar 2019 11:28:00 +0000
Subject: [PATCH 13/47] Tweaking layout

---
 ...content_feedback_negative_disambiguation_main_reason.xml | 6 ++++--
 .../content_feedback_negative_disambiguation_sub_reason.xml | 6 +++---
 .../res/layout/content_feedback_open_ended_feedback.xml     | 4 +++-
 app/src/main/res/values/styles.xml                          | 5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index ed37be5217dc..66a949d40690 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -20,6 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
@@ -55,10 +56,11 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_marginTop="34dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:clipToPadding="false"
+            tools:itemCount="6"
+            tools:listitem="@layout/item_feedback_reason"
             app:layout_constraintTop_toBottomOf="@id/subtitle"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:paddingBottom="2dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
index da2d9beb4d0f..cf2ea4e68779 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -45,7 +45,6 @@
             app:layout_constraintTop_toBottomOf="@id/emoticonImage"
             tools:text="Issue title shortform" />
 
-
         <TextView
             android:id="@+id/subtitle"
             android:layout_marginTop="5dp"
@@ -59,11 +58,12 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_marginTop="34dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             app:layout_constraintTop_toBottomOf="@id/subtitle"
-            app:layout_constraintBottom_toBottomOf="parent"
             android:clipToPadding="false"
             android:paddingBottom="2dp"
+            tools:itemCount="6"
+            tools:listitem="@layout/item_feedback_reason"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
index b977326c3fd7..79743af94226 100644
--- a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
@@ -21,6 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/rootScrollView"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
@@ -60,7 +61,7 @@
             android:layout_width="0dp"
             android:layout_height="140dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="65dp"
+            android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:layout_marginEnd="20dp"
             android:hint="@string/openEndedInputHint"
             app:hintTextAppearance="@style/FeedbackInputHintStyle"
@@ -82,6 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
+            android:layout_marginTop="20dp"
             android:background="@drawable/button_contained_bg"
             android:foreground="?attr/selectableItemBackground"
             android:text="@string/submitFeedback"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0e20db7c9bc4..f101929b85ec 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -287,8 +287,11 @@
         <item name="android:layout_marginTop">12dp</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textStyle">normal</item>
+        <item name="android:layout_marginStart">10dp</item>
+        <item name="android:layout_marginEnd">10dp</item>
         <item name="android:textColor">?attr/normalTextColor</item>
         <item name="android:textSize">15sp</item>
+        <item name="layout_constraintWidth_percent">0.8</item>
     </style>
 
     <style name="FeedbackTitle.FeedbackHappySadDisambiguationTitle">
@@ -301,8 +304,6 @@
     <style name="FeedbackTitle.FeedbackSubtitle.FeedbackHappySadDisambiguationSubtitle">
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginTop">9dp</item>
-        <item name="android:layout_marginStart">10dp</item>
-        <item name="android:layout_marginEnd">10dp</item>
     </style>
 
     <style name="FeedbackListSeparator">

From 7d1ce5757be03a96777bc944cb0873ddf6162527 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 20 Mar 2019 15:15:01 +0000
Subject: [PATCH 14/47] Add scroll hack to ensure submit button visible if
 possible

Replace faces with PNGs as vector drawables were rendering poorly
---
 .../ui/common/LayoutScrollingTouchListener.kt |  38 ++++++++++++++++++
 .../ui/initial/InitialFeedbackFragment.kt     |   8 ++--
 .../BrokenSiteNegativeFeedbackFragment.kt     |   7 ++++
 .../ShareOpenEndedFeedbackFragment.kt         |  36 ++++++++++++-----
 .../drawable-hdpi/button_happy_dark_theme.png | Bin 0 -> 5058 bytes
 .../button_happy_light_theme.png              | Bin 0 -> 5012 bytes
 .../drawable-hdpi/button_sad_dark_theme.png   | Bin 0 -> 5147 bytes
 .../drawable-hdpi/button_sad_light_theme.png  | Bin 0 -> 5090 bytes
 .../main/res/drawable-hdpi/ic_happy_face.png  | Bin 0 -> 2982 bytes
 .../main/res/drawable-hdpi/ic_sad_face.png    | Bin 0 -> 3001 bytes
 .../drawable-mdpi/button_happy_dark_theme.png | Bin 0 -> 3041 bytes
 .../button_happy_light_theme.png              | Bin 0 -> 2910 bytes
 .../drawable-mdpi/button_sad_dark_theme.png   | Bin 0 -> 3122 bytes
 .../drawable-mdpi/button_sad_light_theme.png  | Bin 0 -> 2971 bytes
 .../main/res/drawable-mdpi/ic_happy_face.png  | Bin 0 -> 1937 bytes
 .../main/res/drawable-mdpi/ic_sad_face.png    | Bin 0 -> 1986 bytes
 .../button_happy_dark_theme.png               | Bin 0 -> 7229 bytes
 .../button_happy_light_theme.png              | Bin 0 -> 6912 bytes
 .../drawable-xhdpi/button_sad_dark_theme.png  | Bin 0 -> 7221 bytes
 .../drawable-xhdpi/button_sad_light_theme.png | Bin 0 -> 6948 bytes
 .../main/res/drawable-xhdpi/ic_happy_face.png | Bin 0 -> 4157 bytes
 .../main/res/drawable-xhdpi/ic_sad_face.png   | Bin 0 -> 4143 bytes
 .../button_happy_dark_theme.png               | Bin 0 -> 12047 bytes
 .../button_happy_light_theme.png              | Bin 0 -> 11767 bytes
 .../drawable-xxhdpi/button_sad_dark_theme.png | Bin 0 -> 12075 bytes
 .../button_sad_light_theme.png                | Bin 0 -> 11755 bytes
 .../res/drawable-xxhdpi/ic_happy_face.png     | Bin 0 -> 6499 bytes
 .../main/res/drawable-xxhdpi/ic_sad_face.png  | Bin 0 -> 6535 bytes
 .../button_happy_dark_theme.png               | Bin 0 -> 17442 bytes
 .../button_happy_light_theme.png              | Bin 0 -> 16757 bytes
 .../button_sad_dark_theme.png                 | Bin 0 -> 17474 bytes
 .../button_sad_light_theme.png                | Bin 0 -> 16843 bytes
 .../res/drawable-xxxhdpi/ic_happy_face.png    | Bin 0 -> 9015 bytes
 .../main/res/drawable-xxxhdpi/ic_sad_face.png | Bin 0 -> 9038 bytes
 .../drawable/ic_button_happy_dark_theme.xml   |  25 ------------
 .../drawable/ic_button_happy_light_theme.xml  |  25 ------------
 .../res/drawable/ic_button_sad_dark_theme.xml |  25 ------------
 .../drawable/ic_button_sad_light_theme.xml    |  25 ------------
 .../res/drawable/ic_negative_feedback.xml     |  23 -----------
 .../res/drawable/ic_positive_feedback.xml     |  23 -----------
 ...feedback_negative_broken_site_feedback.xml |   3 +-
 ...ck_negative_disambiguation_main_reason.xml |   2 +-
 ...ack_negative_disambiguation_sub_reason.xml |   2 +-
 .../content_feedback_open_ended_feedback.xml  |   2 +-
 .../content_feedback_positive_landing.xml     |   2 +-
 45 files changed, 82 insertions(+), 164 deletions(-)
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt
 create mode 100644 app/src/main/res/drawable-hdpi/button_happy_dark_theme.png
 create mode 100644 app/src/main/res/drawable-hdpi/button_happy_light_theme.png
 create mode 100644 app/src/main/res/drawable-hdpi/button_sad_dark_theme.png
 create mode 100644 app/src/main/res/drawable-hdpi/button_sad_light_theme.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_happy_face.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_sad_face.png
 create mode 100644 app/src/main/res/drawable-mdpi/button_happy_dark_theme.png
 create mode 100644 app/src/main/res/drawable-mdpi/button_happy_light_theme.png
 create mode 100644 app/src/main/res/drawable-mdpi/button_sad_dark_theme.png
 create mode 100644 app/src/main/res/drawable-mdpi/button_sad_light_theme.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_happy_face.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_sad_face.png
 create mode 100644 app/src/main/res/drawable-xhdpi/button_happy_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xhdpi/button_happy_light_theme.png
 create mode 100644 app/src/main/res/drawable-xhdpi/button_sad_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xhdpi/button_sad_light_theme.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_happy_face.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_sad_face.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/button_happy_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/button_happy_light_theme.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/button_sad_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/button_sad_light_theme.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_happy_face.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_sad_face.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/button_happy_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/button_happy_light_theme.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/button_sad_dark_theme.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/button_sad_light_theme.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_happy_face.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_sad_face.png
 delete mode 100644 app/src/main/res/drawable/ic_button_happy_dark_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_button_happy_light_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_button_sad_dark_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_button_sad_light_theme.xml
 delete mode 100644 app/src/main/res/drawable/ic_negative_feedback.xml
 delete mode 100644 app/src/main/res/drawable/ic_positive_feedback.xml

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt
new file mode 100644
index 000000000000..1ba4d5a5fd26
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/LayoutScrollingTouchListener.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import android.view.MotionEvent
+import android.view.View
+import android.widget.ScrollView
+
+
+class LayoutScrollingTouchListener(private val scrollView: ScrollView, private val desiredScrollPosition: Int) : View.OnTouchListener {
+
+    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
+        if (event?.action == MotionEvent.ACTION_UP) {
+            v?.performClick()
+            scrollView.postDelayed({ scrollView.smoothScrollTo(0, desiredScrollPosition) }, POST_DELAY_MS)
+        }
+        return false
+    }
+
+    companion object {
+        private const val POST_DELAY_MS = 300L
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 6aef7cfacdb6..1212cc219e15 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -54,11 +54,11 @@ class InitialFeedbackFragment : FeedbackFragment() {
         super.onActivityCreated(savedInstanceState)
 
         if (settingsDataStore.theme == DuckDuckGoTheme.LIGHT) {
-            positiveFeedbackButton.setImageResource(R.drawable.ic_button_happy_light_theme)
-            negativeFeedbackButton.setImageResource(R.drawable.ic_button_sad_light_theme)
+            positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
+            negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
         } else {
-            positiveFeedbackButton.setImageResource(R.drawable.ic_button_happy_dark_theme)
-            negativeFeedbackButton.setImageResource(R.drawable.ic_button_sad_dark_theme)
+            positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
+            negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
index 271ce5fe3205..314408e333e4 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
@@ -20,9 +20,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.common.LayoutScrollingTouchListener
 import kotlinx.android.synthetic.main.content_feedback_negative_broken_site_feedback.*
 
 
@@ -56,6 +58,11 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
+        submitFeedbackButton.doOnPreDraw {
+            brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInputContainer.y.toInt()))
+            openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
+        }
+
         submitFeedbackButton.setOnClickListener {
             val feedback = openEndedFeedback.text.toString()
             val brokenSite = brokenSiteInput.text.toString()
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index c99ed46fb48f..266247df859e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -20,9 +20,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.doOnPreDraw
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
+import com.duckduckgo.app.feedback.ui.common.LayoutScrollingTouchListener
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.mainReasons
@@ -35,7 +37,7 @@ import timber.log.Timber
 class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
 
     interface OpenEndedFeedbackListener {
-        fun onProvidedNegativeOpenEndedFeedback(feedback: String)
+        fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String)
         fun onProvidedPositiveOpenEndedFeedback(feedback: String)
         fun userCancelled()
     }
@@ -47,6 +49,9 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
 
     private var isPositiveFeedback: Boolean = true
 
+    private var mainReason: MainReason? = null
+    private var subReason: SubReason? = null
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.content_feedback_open_ended_feedback, container, false)
     }
@@ -58,7 +63,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
                     listener?.userCancelled()
                 }
                 is Command.ExitAndSubmitNegativeFeedback -> {
-                    listener?.onProvidedNegativeOpenEndedFeedback(command.feedback)
+                    listener?.onProvidedNegativeOpenEndedFeedback(command.mainReason, command.subReason, command.feedback)
                 }
                 is Command.ExitAndSubmitPositiveFeedback -> {
                     listener?.onProvidedPositiveOpenEndedFeedback(command.feedback)
@@ -104,17 +109,17 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
         title.text = getString(R.string.feedbackShareDetails)
         subtitle.text = getString(R.string.sharePositiveFeedbackWithTheTeam)
         openEndedFeedbackContainer.hint = getString(R.string.whatHaveYouBeenEnjoying)
-        emoticonImage.setImageResource(R.drawable.ic_positive_feedback)
+        emoticonImage.setImageResource(R.drawable.ic_happy_face)
     }
 
     private fun updateDisplayForNegativeFeedback(args: Bundle) {
-        val mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason
-        val subReason = args.getSerializable(SUB_REASON_EXTRA) as SubReason?
+        mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason
+        subReason = args.getSerializable(SUB_REASON_EXTRA) as SubReason
 
-        title.text = getDisplayText(mainReason)
+        title.text = getDisplayText(mainReason!!)
         subtitle.text = getDisplayText(subReason)
-        openEndedFeedbackContainer.hint = getInputHintText(mainReason)
-        emoticonImage.setImageResource(R.drawable.ic_negative_feedback)
+        openEndedFeedbackContainer.hint = getInputHintText(mainReason!!)
+        emoticonImage.setImageResource(R.drawable.ic_sad_face)
     }
 
     private fun getDisplayText(reason: MainReason): String {
@@ -136,7 +141,20 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
-        submitFeedbackButton.setOnClickListener { viewModel.userSubmittingFeedback(openEndedFeedback.text.toString(), isPositiveFeedback) }
+
+        rootScrollView.doOnPreDraw {
+            openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
+        }
+
+        submitFeedbackButton.setOnClickListener {
+
+            val openEndedComment = openEndedFeedback.text.toString()
+            if (isPositiveFeedback) {
+                viewModel.userSubmittingPositiveFeedback(openEndedComment)
+            } else {
+                viewModel.userSubmittingNegativeFeedback(mainReason!!, subReason, openEndedComment)
+            }
+        }
     }
 
     companion object {
diff --git a/app/src/main/res/drawable-hdpi/button_happy_dark_theme.png b/app/src/main/res/drawable-hdpi/button_happy_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..2023a9217d073cf1ee0929c4410ae477ccf78ded
GIT binary patch
literal 5058
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/button_happy_light_theme.png b/app/src/main/res/drawable-hdpi/button_happy_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..c32c34a716d238a92e1f1a493d4f5e7874320a9c
GIT binary patch
literal 5012
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
N1FJwm6-uvy{{uFfiKGAk

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/button_sad_dark_theme.png b/app/src/main/res/drawable-hdpi/button_sad_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c2f66d94704aafe8b4ac3b16f6927931f400048
GIT binary patch
literal 5147
zcmdT|<y#YO*c~Gr=?DSo7$v0x3_xPU7>t3V6s44qke1QiB^?6^9SlSo328(r>CS;P
zQX(k>UViT%@m|;a;eO7C=f2MU;l8f(obyEKqTsYtY*YXMfEJ;lioV8z{|ZELeLfa_
zJaY{sZfH0RP&UA^2>>vTBUF|3JxO*<yb?GJZeOiUWzP3-S@wi$!#ZxmVkx^Ql)+)a
zJUm9a)cI7pogpwSaq-fFJ1aM@u~Jj>3Eh*i4;3qs<RXc{I~0_VgpWl$?3B|G#-#b}
z=4!Whgh@H4gF<{G9*_6&{<`jCP<`=_li;&=;(z{co*Tffp4S5gjb-L~FHdI5!<}A|
zQ5pU<6fOP~R=(yWlgm+lMqi}fVRu=;fE7rT&HmR60gJ2qyFRQvzd^#^QG7ABcS~5G
zKVinqi<^}dl#hEy1`Lv-3hRK?M2JGFRZ930)J!>)O`AdhM4#E(Hw}DXJLo5ZmS-`-
z=s+oE8$UIuaK62(D}4Co@Em%%))zEA0D8@HH{7wcf7MlSw#Dz<a@b7pql2VcdX$l?
zYRoq3xXo+*J;qTXH-KSBYbDUZh78H$e3zA`Ea2j3lF(M6s+t*FWkN5Itkaz~&jc$o
zY4iYOEwkKHLX!Ow;@9N|QW8I#eSQ0T;tlIyLI#vXjjcnQcV%n5q>(?dTjFqq8O_tF
zQv%{Z;zvs`J2Pszu9+EDrB=EE&9Mm^EJ`pmcM@eWFxpI<w*uEKRM4(M2_<L(!#+BL
z_cU>%I*O0yMn~O1kG*vH!M|*pL9yCMq}WWgjSe%pZEc#X)-!dDSn$T~ZVM<E+3j5t
zwA=^!DS4o2dpe}D_MQPHSiq6EJtax|Sy%2rj$c<2sAftDHH_3tMw991e2@AQt+Cw(
z8Vd>REP=LAX4;{Xd_;JlSR*?!G_i&@h_75zUXPj?$3zmU*nA^l*bcKasH5Hny=D>N
z(4%~EDyUI>uxzB>_L!_jqo?$v&(UzSh|#`wObS`7;pj|spiAa^6{Yl7-Z*y&QL#+=
zqToPeZ?rYjvR#7#ea}Lyk^xzbr-5rS0+FQ2W$@h<px&lH*6WEEEb!~8fT*|e0g;+9
zZ7$O5U~{x=gt%61Bp`W&&zYnD5m`pcfJI-DIA0sC2E+k(qazV4aGR>Ki~-#h5eIe+
zXR8DvHaTj=rvHy9Se`xuI9gy>QO4l#g#mCUA4#NI$j}0Fpk*N-N}r2i6BvtHHz#N?
z$0JAP^BnAy0};>2OLyaWvVC0TvN3jY*>BNIJyR5%8cNmH%u!#RAf$4~1&c?R<ozE$
zh>Yz1thj}wrHmA|@r5werk6+Z_5VJ5Re0Mn1+P7N${PprUHcGu(6|{a(Y+kj+jxv$
zoaU6;A2gA=`<<+`Efyi7?7H?#c+TJD!HX&=#T%SnKZy#NqWv@dGrzxEXZr`c&ph2n
zAx)e*j}ovC)Sx1j3llsDg{w-g`i<E5@QIfYrogw{u_CSgdp|o=Bz4*bcm-{=k`GSH
zz`hr~XU^kTFIs_*hA$6qDz~nC47B;NcP(zD=-L+DnjtufYxU~n638*-a&)pTD|5*3
zOJxaD`jGQn?hv6`q>SDKTUvS=zd&5!-q{N9bR+tQ|0nz6;epqH7B_9l7gZl<{SU_;
zqC~$;yl!s5Mj6`;z@`j@)R!bNl8$z;-tV#jUPAK64UsU^^!(m&8t*E6Kl!wcQ%EV`
zoys>mcm@Mt?36;0=t-e~dD5B4gnjZ_E8zg^CcCs=C#Gv?f~{nTJz%o4kI;~&sLRO;
zE;r+nq1s|sBqS$+yawaCRO)kXJExb(%}i@;5f;CuB2H(lE`<uq5s2LFJ;Km$Xu+0_
z0+>b__mQ3a*5W^d>Qj-E2lxE6G}*?8D~04aj=WZ~@RufTn1E&IYAGqA-k~7iJfj67
zpnXm}l=92jR_Rqu*$Fad?U<_5N9F?vCg~xJU;Uo>E%u>@<#BcD)6k2<oy7REB%8d1
zAi~`Cpsh6_G0D&l>-Dm!^A2^IE`*|8_qoWLOCp50&vtbr>8GY?+*eqjqL@|t`b=}I
z0AJwz4qyIh*erL?>BaP{yZyAsRY)k`Do$+W?|$;{cVBWm@ay671Y*qaakc0q(+!{_
z&vc&jx20n$+7}m<&+0wm0wOor(IfudX?NRs$iA(PDnHaB!<cU5j+_Ul)VyjMW_O>*
zDHW9x8Bt!Fj#_8d%i)q52so>8Pv}hVbIm()U(zrpFS;x~2m*)x;&3Xa?uCV^NU+ez
z7o-`SD(%p_MYCD)U!h(Eit}LP)2X#HwRtOgmTB=Xi+4cVM<dxC=!1Mw&X6}UjG&D@
z%8McBzXYFIPi#uf5AF4;9jKRl%KQHNwP=yYnsv;KpiQIaV%eeo@5-a>F(^Cb?(Y@u
zZeg6W5FtEte<hrB|9FvXC4r|e?Pmykxd~Mai$T2W&K*bMkQmYLn?I}ULsDL`&dfd^
z^NTM+Fid*ppcCN4h$3Hi=wV|B@p4QF<bUxYJl7->^ECdlHTxUoEN@O3x_ENMjofp8
z_^Q2ZemUWZv3TIg@nD-17Z({{31j$5lCS0s7RwZO5x?FWt6j1A+O6K!=EeAu@mW&N
zud{g5zsHM^&YOdVk(t_Si{q2(cjk7Sc^V*QZ-lv1xTV6=SdM;v*wvi&w#XWuAH71m
zPwO{Zd#YZkM=w3`YxN$HNwQDLePzq+Y>IAGiz93H8_lvoASVBeyPi*1Qi<0ci4Qrw
zIrl!g=q(sKwuVd!D;DTGCzt29x2%2ozQ8HrnU><Nh~r%QxjJ8Q8rn;u4fg>_oDKoy
zl8O?PT@fuax(dRI<46UgW&z?N!=Pa)<~+sSqL@=KG95YZb#7bXz3MW=Ob6)K%58Gz
zntR*jn#{j6<EG5-kfgJz>zyJ|pmUZ-)R#JY@zof-@%xhm{u4MII5j#~pWyXXc~U|J
z(r}TcmvRPUQw&XnpxCjF|9V*lb=TCQGTPbJY7eHj#H}zFjEpFiJW)b5E_>4PYCS44
zzcCn3ZQ;jdcuC^=Uq^Zb!Zx6P!U$gY3eG-+%^X06kgkoS>OI{Oa}O<{2_K`!Zp>HX
zkTRZ+DxPhLy(_gewHJV=woiZlYXUY%s%`d8OOZlc^t_rKvV|#6yN~FXF(4d8v`MUN
zc+k`%(Sljndj{K^(se0?fmKrA&0<>_y|%L+haWGr&RQZQjgPk1vzUawV0&<d+ALn@
z{(Bxy@>-fBD{9fn#$8N2kL{1?4tcf}R^}z6uD4?e(Kao83GK0+o3P&foj~Ga*f`fQ
zF^YqXyY`#AJ{s$Km`v_1Yc(RZT&UJ1)TFIBShk@{n^>lT7M~QBQpgGSJ7=tagkcNc
zM`XQaj1t2^ySiE5P{YKS4JZ23#pBw0`ea?=<iauOMqDv6Sx$BWZi3GdNoO+&&wBcA
z4_psg&2n!l2)A0s+FN+szu~ma8YVs)4<lY|iHfKWjj6Kz*st4bqjC5*Sdp|A74you
zeP($nTjnn>TWP+)x2S`$!`Iqp{??5RgTC4@cGjtD#y1r>-(+{rnK#xI<i5LS4;}p6
zXsYh}rrqph+^@4?sIXX8uHPq;JAW65$rDF6pQNb5*8Z;D5HI#6ql=dk*;!N3KG0zQ
z{2qt9)nsJK9v&yjF(O~3tG6Z%#E*D+x{T6KRoc@`m{l_wmJPL%ibRw=xIN0h+t67{
z^F;I~ZY;3H1%=BweQtCz<H6fLI>;Fq&?<Y<BXdWM>^%O0TF!i-3G6sUt3p;cBB1w3
z!~FN-Fu#8OZ-`Y(Tu$up9~$|?sYd6&aYF5Fk5YSqR8z78D9(Ei5Ay^b0a|BQE^brm
z1hf<zYnUBtH8MsEJ}tHT^gRxB+hO`sz|+`&VfKT&VR|~dp_h#Np5@9m_d~>g1*uR@
zRb$v10q~`bqGOM0qkV8Dvxtol+?lGIXp`0Z2pbFIxbe#LL5`4s0bsLF@YeSuHrX#T
zT(rxHlLr&l{hyZ2=LIe*idqk*LQSz_X7Z~z)GFNNq)Co^P$2*m?!3>RRaVw}M?;%C
z%t4m-hLlyn{;dEpLH#}3tl)3+O1QT7hgP!|6K0KMGc#-VrNlZ_tjy|nr0aL2@MEeP
zrM}tzb}YWPFxc{|&M5Hj40b=v+uC-6bV&*7928RNj>T?9DTj+JV^Ew^>XlT_rD>JX
zWtO+d3EC79)X0g^FMB3q)=>JA1MmJXzU#T$8)98S+UW=Cf9B%Hyb<pT^IFSEJH7`1
z?ojo^CuA@9c|1L1Fc|VEXe2%^fjV(l9z$1PzC19a=w;jxw}{7B<Ti(<jOKf3Zsqod
z;+Ub29=%v@vqo)!js<ePN4ZNOsof87xDKN0vM>@KUs{%s#X@t$YpXDVeh1DX>^)v?
zhO&>xlxujo-??$3=;R+a1<FuA9j?)NNvtSPz;zSW{GPDNznB#^>3lPRFV{fuC{|ig
zna-=6(}{nPqb(7_vgY27d(LJRgG5<>*bl)sE0RNc`Ey$M1#WFG2z8meuYgvNyCclz
z(koF~>OIBu4!k#)4)Tvu(}AYh-Y3fw%MWm$nHm2Gh`d{T63FfJvz^ADEwx>R*1n6`
zMfz5p`s675rf}BV-}YUk&V)XThYt;Nne;L}coUooL&v6?4+%8cRXo7D968cVeb{h%
zX_3%GL#HVxq2(kPI<9igYd`H@n58g4Bp&q(J4`LL4%P}+J0TF{zLsum-m)`G*9L_H
z8LPq;fXm6KX-_)P7NX@m_#h?Y9@@Sg?;>?}Hfb(L^iK|;M6jM>Q}o-;FH<}0GiI0m
zGcKK!b`CO|@ELQ&nc$}EwGesCO~P2nhZ-DYDeRBOcvpv0+L@C;XUpqEZH<nO6C4h9
zxfRBQ6qH+>Ad$~8ZkoN9+h_heigBPG2e;?N8OKX|CH{hp=&9H#YfyiiD>yl@qlB_s
z>Hdb-<qlivx!2t^DR{ZIM%AmcBbet~b+G`WdSM)#qCW+{k2ilUO?B;sNYRTD>}(Rk
zogZR8N~aBNj`)0im0jk3|Esc5nr-@f^=av%KW^OUxKv3vVG9<0!s3BnN>gMqmp7SB
zwZw%5c?3MbCP?4(n#~1JKD*R`^e#`@XeB1y`EwV=GJmSXW;!#Q@B1OE>Sd+Dg8UfW
z1LFPVSzB)Yx##gIz*wKF#NffpN1zBs4b;*U*<hljobTqJ3P~fopB=MMKTUC^<G7Wj
zwFq=k+v86geS$}wj@s~1e~lUc<FTwuZWH_Qu<eNv9Fvm6RAvyZ9LbRt{MJz?j<)um
z{W{4ih;)bbq>sWR$o8?0U_mHXDX{s_OzEhTSB+gvga9##@OY5xPLqb>9O0Ez%q~vk
zsrlY}t#N-AUvm`=A_}>WjuQTR4dB=&rtb)My2%<!;QS6_E={}rIbh>MV1wKA<s8z2
zjX5L`sY&YG9kc7DFG_gv<slG<4<8FoV5azbn6t~O^DA{g$}>d5<f-PL4cV54*}>PX
zA6t**4TDN0oCFKVPZy$XmP+fxB00V@0mbD6EU7r@R;aFXnUVRrYTR`$W6S^MU&hmh
zb0_yeje)LX7`^QF`v230Ji&tJnDDP?PgIR9Sa|t8vKM-@*D+sr@q7zgxIj#%=QK?{
z6-uu9FjiFfs=gzUlQl?|zUYVOV>E+3b;FC@_p+nw8?j2{|C^6X_Em3)qtmd%p7NJe
z;kQSlyB%W#)yRHCH!%!r`7+WO<Cy&K%FAbe+q()8xKVo-_?Az}m(TQe6g^JA+CaKA
ztg^DwEDz99Hvv*RmWoko>c%s)>eJuiqC)rj2j^*aHv62QtgEN9?kd6PIz80$)X5k+
z`F}C~V8lV_gPjCi?9kDGgX)S`UGWc~nLkrmW1jzHaCays33~V^!ZXyR1|)J?7)gT&
z4!i%*n@Y}0bT8s2x4$9>-BsmB((xbUKyIaznHt9=$o<mrHcy4zR_^lz3=JJ!OGFq;
zD3gx1yyd|Yz@IX3<teIE<f2=<^5pO^G+q4p@sh4^4afYy1YC3)<#uQE>Bi5(RIn1A
zaH)yQOJ7#JA4NoX_@&gnd&<;zah{R>OzO3LEBe1a21JEg3h`?QB%`Ou?`@jY_PH?e
z67g2_;7$h1k9eMsGZGQJZ5t-{>>kUmC__ZaGpGxR0!zVpeA%9OKybF5TyymwNg&iH
z^nH$XKxk|vJ`X2Y@arj2kGX<1(OAQk#ga*tNhkWw?B@HpEBb^6zU@OMMOYx4475W#
zG|MgZa*JNWL#WYnvN~CVUY%iZf>}jL5X-}@oM*%0Z*})JJ>r<rqgjaZmcJF{zLpkm
zo}j=j)B57vDzn=f<B_=Ibi&d0e>Z)+Jl$~e$?B4eUZtccgSC9`ClPwBeeH3?6=#Q&
zn?UH<SONOHm@vL%f4O4F|3c;}nx-Pe30$OJYj-KYvnBAP`H$9Zi<mv|U2Pa4HJf@x
ck?iuOb6bFjB$kBc`nL~&P(!Jf!OVmI2el!<`~Uy|

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/button_sad_light_theme.png b/app/src/main/res/drawable-hdpi/button_sad_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a20b40191caaed4e7c38f4fb0fb3d8bb5c89430
GIT binary patch
literal 5090
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_happy_face.png b/app/src/main/res/drawable-hdpi/ic_happy_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1834b1b886975747a7b4afcb4b674bf57aa8ec9
GIT binary patch
literal 2982
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_sad_face.png b/app/src/main/res/drawable-hdpi/ic_sad_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5c6d79c3402c271980b51e94629f9a4e432e89
GIT binary patch
literal 3001
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/button_happy_dark_theme.png b/app/src/main/res/drawable-mdpi/button_happy_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c72b436370424c610108ae49e42e0223cbe1cb
GIT binary patch
literal 3041
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/button_happy_light_theme.png b/app/src/main/res/drawable-mdpi/button_happy_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc783d0c075831e93991910cd96559f5ff11faa8
GIT binary patch
literal 2910
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/button_sad_dark_theme.png b/app/src/main/res/drawable-mdpi/button_sad_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..da25e3f3486eedc0325fe0452bcc6a93e16915cb
GIT binary patch
literal 3122
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/button_sad_light_theme.png b/app/src/main/res/drawable-mdpi/button_sad_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0dac61033e7ea92cdb60444a07b1f3d848ac809
GIT binary patch
literal 2971
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
L1<@>1w~zV{VL;V|

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_happy_face.png b/app/src/main/res/drawable-mdpi/ic_happy_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..37eb75d97b80270019cb15a839db2e850dc826a6
GIT binary patch
literal 1937
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
X?&ty}H8w`800000NkvXXu0mjf+f%2{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_sad_face.png b/app/src/main/res/drawable-mdpi/ic_sad_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3dc205ea960281018ae301a59e956f91cfb0a5
GIT binary patch
literal 1986
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
UR#ee(y#N3J07*qoM6N<$f~^FtBme*a

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/button_happy_dark_theme.png b/app/src/main/res/drawable-xhdpi/button_happy_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..634ddfd8f774e0db8527000d478078e9a9354906
GIT binary patch
literal 7229
zcmdsc<yRC=z%{YJl9EeHhqUBU0@B^m-7K-7G|18{E+{Px0wMxZ3JXZMbeGZsOG<aw
z%kO>8^G`e<X6Bxmd#28uIrrQP*V9oYCZHq0z`!6@S5q>0Y#073K-|Zg-h4FTvB7+8
zp!yQy+X%zfW7mbcl7dkn=AKo^2ZrvT2WO_nkPxoC#fhy5k_g9H8TJx2m<PK<jSwy^
z1v3c1orbkC<FsP*HU1=yqU@z{{GO2-RMMZ63@2L8Nev4Nlb~DiCsB(0OW<1lqMDSf
z&P3jukdT{^i^Ojxt@R=;A~(pay!&hSZz0!rcWqam7jG`!K*qquVgitnEHYOx)|E<{
zo}j^R-U5}rz93<&vzLX=<Wnyx%iQvMs;Sj-pRn2DVU{`i(%Doiim`KNezyF`SR_fp
zwyX>oNUpFnh4bkE?Wv~A!__%vqR0-Jv0f?pZriYDQ<){Oq7%(zifu|m9P&d)fq}G`
zY_&XpQ~7$p9LKck_6S>$z|Gcv3?a2nXS9TC_PO?Vm-UmYa@R(Bk<}2DLO3Z+$L1C3
zRDi^b(VelkUMCyFcyT*|6q^2oM?<%#LRm7bbv220$F2KqrxTjeB3VPaHTD5^rID;G
z^9a}yX@`r<yU|OBBE5fH2kj4UM{7cbYaJzU=nu}=h2gO$+@`*!aC(a$RHpFWTJmCo
zXEVQmmkgMp8@j6^;am;=kT~UZxYN2oq5U78bW#s6&J~0Z#CM4ay5(*zj>&ywe~FL>
zbl(<_jEuD9=jSKlCRYU-#&fEY=GPUBSJ@5v%c_Kes$ps!;%tS?SdwX1oE}@&@;T<>
z6;s;h)!=JxplU;d>-Z-f51q!>66E8y#WGmGTf2556X_);r1P|-vK;GLO47*zY(g;>
zT=YR}zD?~;b!6loG?<PwNj9Whv9;WXfCHQWZZ&`EB^s=E!XM?r@82*K&B9|$TQBrC
z9*L!-9Uy^sY-gL^vvunj1OnzFbul@I+{pC{p)9ycBZvsMz1xv(cSZ=yg^XE;RANlk
ztB^Y~SuvP33)&oas;eWvC|W)oOJ)nuAQSTK?8|#eAcE>o?&tqz7Gtz)3!uTI#axM9
zh9}GU{zMhR8Opg)hr}@f**G;!Y#qRV3pJfAKr@&!eEr?0qd7Igni-2A06+p!!b_9^
zj7C^#IAD>D4%kH34+Fm>!KhRdZWE(Lu&cNu%mC*OkCQV-Bv_U!fs-R@XiZdLWJ0R)
zP^FpAwf`7LXd?EzowDO)X)#p_`LKk`)-J$R2860j1MtBNR0IOH0yJ7nU__C{Qi&Ka
zxPl7EYP!i<q8-5h@kxM2thxMCQ$<g6aoCor0Rz4&oR+ikZxy1}Z2^|@g&q7^P=Vi3
z?;HWYU&8RqGTO|{Gs$dGO_dk|*8G5vQ1`8zQa@Tu&fGzQ<&{7GmnnrJZL@*E2vc?p
z5w2+4jZ2|7+C;_DM5!uxMZ|XwWW@ITbj?x0iL3p5M4yj^J`O3$WJML1)zwr>5Qn@k
zwOjJ}87xARaq{7fCDr3?jbe~(rF;YOWmCn-fh7oDOIdgn9LR8jqMtv9VEz-m*w3f*
zm=gie2R!+u8j>pYyvh)&R{VJJVsv(?xAVoA$ZM4N<;G9(j{!P>NaF38$!9Pdd92B^
zUQHE65PeJ4O=^u7gu(ibodjEP;X3O}S&?-Kg^yIR2Vr<HWgnv{5^DFeNKBvkL~ztC
zW=GI1uJpA93pqKog)LAxHI7)C{1ByzeW(+F%G0>~@_RT(qOk~kN~pp}XqTEJAly96
zzd$QQcP<B$GaD3ik22PjUjC_$j!j<`bzr@n7DQ}Ke=Bw~tuJDl@_wh7L@!&WCzT**
zF08@+);ES}b^#?BdE(*7I!E9!y#MmkFwHbWJEWkXufsv@=Z~4~=SL&k6G?+!gj{{f
zLBi-=W(eCz_oelDG1aQ=NE(Q~ww1c{21@YMG6d^I&xNe`Icbe1a^rIA2Uq=0ZO?Zc
zG~QruM<eJv_1jj<Y9lJDLZ$@OgDkAka4^P`>Vv4Zz=i}%Fq{_ax09nG9v~y^IqvBF
zl@YS2zn`<PaG#|AcqlASzOJ_X36>U;&W8v`?D8F?7bW*soJ`964v%a2EZIY@l>?WZ
zH)oFYaEZcz{%MjyKob71?G~<`*Op1-;&y9JHVnk0VG;<oDwkJHqD8>`FTxbxG{i#P
z%mMkA^*TssaLE8eHm{iwLqw7(&C@2T<$<QftVLG=%2A>l35z_d>I0|EMpX5^qp(1Q
z!OjKG#0${(P|(|-GQ<IvQ@Lz4UUD+-vd{hGZ?fObFBeI3ZoP}&`Cw(}RD=^rsyw0a
z0<QwZg<f=W|Gs}_L{2e+nXS}-=aq%Q5~EMpn1s7+{qn^V-c1g4eyKhl(AOx2iP2@C
z%xi7wuV_*E=5(&Q2cz`di+wHThBu8Px*Y?`3$5Q(D!|eBCWyE#M&b{*r&Dl^Mh{`3
zUr@@Ifm^s1%^`xiC<%e(2ufNuUI~g3f-Jjmy6cB&=|7<^ym;E0m8%{?Df{;obwVM+
zy0p1C-3#5(BE8BNrSQe@%Mrl33frK(0gyo1o)oB2W&Q&D$zKLo&0ql|70*9?Jc@4!
z`~4PYgz$-nlWh%=yPKyV0fd+xjZVLPVFE}%$KtzSC@oA}|C$$I;`f>rS72t~w<@`d
zsl`X$5abI8MQC2wqq3M4EAAgQdX6|*b~)GzabALz$9O`v3dEND)d@Z)p)Z<PZDYMZ
zLOH*Taf!dRjQ3!5AGStw@A26RA?enC(O(S;V)I<{Q;fg}!elg->T7G`<hczNP;jG3
zRgUGkcb8#0%Pbz8x$;<^bD)T}-y84s*!6h8XI`Z;=Fe7EGbH6KGbW!?S$mwUtbcNW
zoin>ld6FdnXwmc)uLLSfm+v8g7|O5k8lj!8dOIrg_ccCA@<NWS`N!KQlcZ}$saRjM
zkapazye-bNRuzS^@4;9sI{`m19G63GjTICO|Nr2Un)n|UQece2WF=E674;#f5|$Yx
zO^FD{V~%WAGv~WF+nNG<UOK)4!7G6VFPy50tMLN-IP=oI-r3)=Fc6>If&a<v-0_8`
z`#QcV9%Rh=!NXmV8CIb)kmZxiuC=9i?=#sbEEt!1(D{#&zVXS_A$DH`0Y5{Ylg~8y
z{wtn`R7F*l+HywBxr34vvk4B8lyb_+cC-dX5{Y8T$?VK;%n0G)G}eprLsEpXN0|sq
zOU+=wPi4M>xi`nI#UzT9AI=zbIyU&ZmPzNT#+h?PT8T6G@-fh$fbgA(a)zHb3WB?G
zq;Xw(pwBvPF)=5-3S4u4Xte8VnMvA-+T9dLU$s~5XPG{(mvrS>GJ80pALw((A`^7#
zVdB1X{vy!ZL9ntp45XDmGjm+!DDCS3oRVpx57y0<Wh@Jsb_?8Tb%6doF0VNqOsz~Y
zzlMmL6bfXOvY`3ukHTOra`gh8^J=KQSqTh?%?nc{aTWpDf4X<hf@^gyaBdWxr(u>+
zgO<2H=beyVUirR`_WclM0adCteU;aa$}+bmlBTVF*lYR9v)U7Ea84#OlL}*Omoq-X
ztO@||qz*I)pHj&C1-Ks@@LCIaf<Huv=O*a?;pV*>!e`0JE8KpX7$qA;Me!7DB&pM_
z#h_AS_&KjRlk#1N(VQ@ix4y|bnYKlcm>s(xzQkhiGXsk4@iU&yv)5~T#;Yk?;<%=}
zPJiCirg2zKclD5anY*kj5|!yzF_bOprsWBj1xOX-49$C@^$KTGKSIx@DmG7YB#UaJ
zZ{{ZYomwg<r7Z0BcaxW>5CbK3RYdyefzlDxXD3+*;|z{_ih0$yHD5}|1%kNeQQG^i
zyCGdoBJ+0L5}(mBHe1zK(LQ9zy$pc`wI8CD<D;1A>Q07?h}dlnzt7FmVzZTDsBY9Y
zxz215at5d+GZ{Lyd!iELwUV>(aDROBdPnLgZ}79nYf%PU)GY3xAelpQvYVCbde7O6
zd*JYxMy8XE&!V4bCbkQj;X71ecq9IEke&8kg-53Fl(29#WV@`>dHr?Pn^{R!2l4FU
znV#RnVby%-Io8CmILLl4%4|<$i^T<>0pTh&ICE2*&XIdzJSihK^tsaH+eeL}@*9#e
zKJ<$E;!IB(k#V520f`0J&xG<T@0G2_Uz=GTuu~R$rp}7b(g?1CZ;;<oLAoazH&qL)
z36cb=aphIxbrX*<rY%>08PIsDD|KUho;kO}r7g8}YnbnmWP!YPD^&ND3Qkx;yBiyW
zT2dwPPP{+;jQC#HezM)LcN0AM^1;IdE-&TN{5363^<Jdo>-KEC(!l-iUD=-KimeFL
zo%%$7pt0GmthKSQ4ZA@G^d?CJ?H&|q2scbp<x&os5BbelV~`1LrH!GcfvdKgOFt?9
zwS5zlbN=<_zLF1(>yuX3(tA&E;m)Kj_qjNr(Q@Q|6D*AD22?zNHM4aMkS9Hj)DFr0
z_Td8)qw(J$HIj1^{@aKbKc;JVw2_G|Sx}v<)R%R}B2>%+LEi7154@uzCZca#y~!^U
zDc@twr;`?XFQy!|X^dBP`n26#RsHc(t`hP5M(Wgl$tgDOp8B6q!Dy6WdNvu(gEQaY
zz#GxIO&#V&gkTh@;~H=j4&rNnf=fXQW@=XnsJl5C>%eEos%(p)8))blpVUGo2T#eE
zjWkysk+Chbjjq;QA6Z>n-vfH27I5zpI4JC{Or%xUDkJ!r3VsK?+LsG+)`$j~S~Z5!
zg`Oo0*t~Tyh%z2+!S8Nw%v@ah&6zu4r4dZ}pJ-CQ{lkQRGW5EDx=&@@2|9l?y(C2-
z_t5Q9Q`~ZGcdp?lH<c4@Q$35Xy8_yb^hk>>vA)<=01M<jx6Lqls>&XxbC!)Gc{sV8
z+!(ZPxFx_L%a5%nIa9-iY13X)8=}NXZuU>o{=R7ADD|1?U6;TeAV-rrDGukPM*#xy
zEDm}T+i}i#cX+?CI@WqZ>2EjOl-wCGgN;WawCG4JD2wx1^OUL64K}wiqC=#-43*RE
z<kkfTf3d!FEks8{e#shrLRNL^Wj(RkQmc3fI>PY3A^F7++MXSxL*zW-8bv#4Pg-8X
z0U$$67&iJXZAMA;<Kpi5ElH_Z9E@in3IM$p+#jJKe_cQb3HXkSASZ+SMczJOS1LR9
zgwsqe@W%^)f=v9rMyN^f)}Q<YGbiZ3)5-m}cc1#c|5*QWF4Seu68{6Y=8SOb#)`zg
zLOqHJ|EEsgh&}b6s}DO@n+<HW!vW?a%Z*;;zvxsr;y8v^951p1kkaZ<A#^NLf*AcZ
zIwFUQXi2Q6*?pGsPOr!BVcM{vR3t;^uR`!e%2GSRCwGwoPVI1Ub`AL)F>97!wm`$}
zvu$dX(cXI8!kpwaHO1k_Q(&?xf{qode`~>Te+qH1?LqdutXrFaLs@k2WG+?|W}5Fx
zct^X3ww@z>x`}F}T$nSpJ8hYsHm*Z=03vq2q|xC)iA#S0;)!9+O3$=yCzpRY%naOJ
z&acv2&yN?QpuGbEroUxL7P|}$0`^~6WoDEZbZ;S7t1ZP9n9^z!G*joJxSmYMco_B2
zw{(6O5kdnNwZIX8If&2UnsjDjq$IJ-7kwU*jS<=^8&ST8dF|Gkt<F@al=V_To_Oei
zg^)Mj*uTxR{;9Y?z1GtV;{I2AC`U7KUzfwgbtW6Tx_;!?0+*Geqs8T<3}X{EA+<o|
zK16Y#2|m=lskA&E@|m)OrvK}t+Nw2!(?ScAD%}xlz`}-F@fR*Kgo=2J^BB-Y`pqx`
zlX%8R_;ln|wO0xE4z;)Ha=YBugD3HQ^N{n6;T*R$xJs2P_|?oBsI&f2`7^Mx=DhbQ
zpFUwC=^!S|EnsHbG)&CVX~_EX=bH^{*ufEdu1r?+<zf7qt<1Z9k<L3$usJP+aHY=)
zI0s$y+I{@yX%0fO=n_@7vDy6sT`1082-7In`Rs5Wl8RI4Ftg15r_!BXTi9t;HuSqZ
z8~mE5ROqheSRsEqTpA=!cTFwV*)U<8P=d3pI(qb_gjOs4hR(S>bbmUos&DDx0N+Ma
zeeehFP4MA-gH$T9euy)KaCgTEl_e{$1r{+HI~X3tMW1>0!Wtq^a*AU5jws@`>ms}2
zhZha?FV}Mx(nVKT_p_i__!KwQ1={ilM-<nnzoCf`eC;|WA3?ff-BYGNc&hGJ^lq=N
zj0A|59t6d3)rZy^S9_y*qsXf^+7Bem)X;WR*u78W=>opG>nP^jpZ@B=Pb(Uz+T-cZ
zE4yg;LC1bM6kDhF96f--M)r^|ZCd01iz0we_OiS^CiNG|af0A3NRx-N|Le7PU3S!F
zdY=)4KOK8_LT@)yx3p-#RTp$6^Fj5QC->zUqua+M8|P|sgoW_3wAHQSlW3H_E8I_>
zdtzoZ*u$t=lz`-*4C=x^H}K6mb*40i=w_L3Z#Bn!Ip%#6uNyp>vLiaRgL^Y{rSX|-
zqLSUZ41>}yyzCcd{ijb9m}z1&ru>1b^9qDWLasZSk~rMcil;lwgJ>4i)LuNw;oz7V
z-cg*gw@+bE?*EkV;X-1I?>qN`6q6h~<Klc&hN6A|KiouUA)yP>`KsElt50>azSQjo
zo86qh#Z5An&O)4Zeso%7HrKW{`gJ6zC(N;vG*?Gyd2z73R9f0f>zkHTkqykn5>UI&
zwt}Om4~#ZH{My^-A5@6FTkcot@OEo$JlVZJ!4?%DzOCXr_$oS~ik>r<|6>B1Z0mEJ
zuqb}$gE6=%M}mpF&wenIvE(9Kge`|IX$2?wjkyp2b2k`wYzhmRf^#Pp3fmIY4ZpSq
zO6I94ancQpIt$MPm%h0$OQ4>1E7^AyO~F;W%&U^>%7Xqu;|hA~c79uAmU;6UV2+*6
z)eD!Q%~mR_P$wR)A0K<jxRa4Ls3Hh5FEn2h`g`!+5k22NB7dPC>Qcc{;H=hMEk_WJ
zl<HM{5aW4=Z^8z1Td+T9(d9(TH7++gXWzWbgHV=<O8T=DT!9HHp6X&2yt5{FZ^*=%
zYuLrNQvH?}zftZf3>#ZX=AD}MMp&Q_Rz*I+@m!zOcH$Cx8@N%_#<$SKNjPmy8N(zn
zs9*{iVR?ORaAV?)mwpxaJ?XuCcO^2W0+@UP6!g^m^`m{L<2tYEa?AVV_VakGT=iZO
z%I_h=p-$4IrHXR+M0AF{S323%@DrYm25R*1$9~A5xm`DoSxLTxh0NDk-gd&R7RXVo
zTw+-4KTpM<K79>`WuOlW1G{b$YDg0SuZWyYY{a{<->`WRce=6jRl%_AxQ9Rq{!z39
zIo8s~a7cEb-VfdI50PbZ7#}CdqFXY)ccgri`5t#Pi0#&`p;(b9m#3Ho3iP(olQWIF
zxc26r`<(SUbAmFXC-~|9s9nIx5Z4O_pQW@M5WudVkNC6yTA^}hIxkq=S}^sOXOCR(
zf6qi;is)$Q%44I#VcVE<(;*S|Ps)JEH<j$I<LgX=ILEd7AIjJ@UwDC;TGO`Y?8KZ6
zn=GIaMev8X!VJZATaz?kxqhZ7tZc;<EJV?fYAHsehPT}3M(lsFfu78l@tDgozQ(vo
zo}|MFc&19eCzV0fyIQ|EqhQjc)$PsN&9ZV7E4w~+Y(S$+7^qHfNxj6@5q;8{U?wlf
z@(5DIkpgY1F#OFBs(P69ql>o5;R&@0eUCvga>3(_*&6)_H0PF^FP}a-Z3o6fSi$&@
zAoKe#zav>JE$~vsN1RjgM<D1HwX+iPXv?*kJSY6e@d&IZaHqR3fI{fdYJ1R_<|Fu7
zLj3LB!K0OQW!=qJm`Q4j3i`jWA($5OXC_aNpB*4HT0X);7(KMctJKwjSr6Rp1qxv)
zFMN<R#M0(K_2UPx(ff;FA>=VJ=ND=;!S;LkFVFwizEzpc&{k?t1j`nOzIdop>k@x-
zZgZ98S5%ZI$k2%7f7X^UmZ|+~=Gv2WI8XeAun-ueT=Dd{+<<Tmq;Yu+1^)4Tqqkhz
z;CjB0<4_|4HUa!^9QZPVcOB!=yw$Mi<4)I*g&|&82`G{{0E`r1Ncmj(AVP+6_LgKQ
zYti$({fB<8g42@8t(NCPE{Ki`1k4_|7Ejm(w`&^oRkfvH@OMRFd(QIzBz&uy#4sxv
zbiCFk&kX&cY?&PEsnSsmT&tViwekGheD;j;Lp*06=K@L~*@iR;3sCNuv#`=ex_OB1
z%;D6|{?1QBWF3`HMqt|s`~t)9V|xq@tjK58JTxQKKmIEbWn<`mPOg1PHDRbZJwAR!
znc^kd;7@G_s|_)aA0$yJoFyw9SEFNAXD4rTkT_OMQ~jXDmC`Q@=R@^X<)lmvE(^xH
zI8pR}mwdgU1%W_XNZ_jci%o&rzbY67#S!xLtn!+)PgZ~6!Ot~ho`%=9wA?U1N;+2}
zMb6wT`eI5l9j*c`a02rZVG4e@kM}fas}H0yVslwL3`8cvba2bbR~8X!>9^eUWU7wO
zj-x&t*48}x#H`MetZaD<I#Q;yGo)$STT}3v6~bamgxz`&NX)7<9*WF;YGZ9f3f4Kj
zjK`SOMfQs~#}teg94Frm9aFva5W%umkmpQ*4mONyU#zgwBD`2K)ykGk+|dYlyqYiW
z8mOxnxnkYWzw|Nb_Ax22R_wU+FuaRqnq48k?-4o{geYk`BG_-}|2~qOB-T0h6TKWH
z{|kJGF%?+9W<E~53-XCBKyu|EcB@1By2fNn!hJtxSzMaUrlkW@>zugQmV*F}pMU`z
zInm@ki2cZpb)X$l>cQ}W^V^unF_yT&`(0<iPZ&%Kq|fwtfEaC`%7q@GWE*AjkI72s
z^}dFfzNSU;k8e{u5~juZwJy|q9rURmjnZvgPv=y|jHMSj{&+>3a>UOz_8my0Zn%{X
z5bJqHwkUw+E~5HXd8<j_@Z`V1sfP8v;R9=O1&d~r=sGHaV1xdDdTHT$0+mW#=D-!v
zs>w@^bf-sl1Q5(hGS%r8+PZzls?d7u#+;uk#-=BNWt^-f@FQ8t&2h1g=yBV05%R-p
e!WF+Cu+7QiaEX+6;~w)s40UB4rEf27BmW<7rlw~A

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/button_happy_light_theme.png b/app/src/main/res/drawable-xhdpi/button_happy_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..80807b2008f772c65fa2c481b76d1d13a2b84278
GIT binary patch
literal 6912
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/button_sad_dark_theme.png b/app/src/main/res/drawable-xhdpi/button_sad_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..57dde218d9fcad49a981192414a9367737cbcd5a
GIT binary patch
literal 7221
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
U|10u&$OB?2$g9eImoX3hAELX6<^TWy

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/button_sad_light_theme.png b/app/src/main/res/drawable-xhdpi/button_sad_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..df7ed30f0f37cb99e34353d3ccaae7091911331a
GIT binary patch
literal 6948
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
J)v}f${{_P_H#-0T

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_happy_face.png b/app/src/main/res/drawable-xhdpi/ic_happy_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..b38f937e6f576a17f2d7403e47977d243c705020
GIT binary patch
literal 4157
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
Hu0mjf^X%T9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_sad_face.png b/app/src/main/res/drawable-xhdpi/ic_sad_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..18b2f052a2776c656e2483a79cf171b03fa9403a
GIT binary patch
literal 4143
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/button_happy_dark_theme.png b/app/src/main/res/drawable-xxhdpi/button_happy_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e9e97092345852d24535b8b7c9f6f10d45e4619
GIT binary patch
literal 12047
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/button_happy_light_theme.png b/app/src/main/res/drawable-xxhdpi/button_happy_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a0376a7f4d0e508d897b7b6f10f10c604947d87
GIT binary patch
literal 11767
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/button_sad_dark_theme.png b/app/src/main/res/drawable-xxhdpi/button_sad_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc8d50932021445bcf67473e5f6495cb473248fe
GIT binary patch
literal 12075
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/button_sad_light_theme.png b/app/src/main/res/drawable-xxhdpi/button_sad_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc4e31d439d4163984c74001af6dba7de426be73
GIT binary patch
literal 11755
zcmeIYWmjBH&^C%CI1CUZxVzgV5ZooWYj8<`;KAK3xVt;S9fG^N2X}V{csKX+o^^h}
z`E=HLX3eab*}HdF^;Ol?)zw#sf}8{@5<U_X6cnnIq^J@U6twi)2jM+%#f=W<9q<Kh
zuOuN1RWU|*00qUAFC{9Z@(cPT9q~8itjk_U^JB(SJ02P;2dV!jN_zx080dtm512f{
z)jzmfTdJ$n7$h{5{53Q~70R5f786?k)y?T?{+h?o`0nl>EeJ168ff4R&EY3VD#$v*
zDlxvw=b`F6-?Xm2T1m~zz`;;Tf3)MK`YJ(r=DD8Oq5hotMIV#Q8wvq<!(mFo%^j9=
z4&t`Cp?xQXg7JhK^2FvD-U1bV`f+HCqzzm;p~+GebPP^FBRI*#(SU*mu_g;@2h`}2
z&mA_F--2C){}CW~3$psCiB-<NaIJ|kNk)XvOD^O0D?-7LPQ=6EWBe6gdfyc;UDg$j
zRS=O`Q+|CzfVBhkYzi_Lo9Mbmou>XRS_-35=~a5;GnR`9Czw@=FoV^qcI06&hsC}g
zse>^yUpZE(a|}28?!ku#1m!bE1)}uyboAU2rYjmtG_2X&o*yr5)pEK&|Cj%LzM_pQ
zT5@G%`EzTz(fHgI_x2GPy&x1^b9yHwEFN>>u!IZmz_NT45$|no1OYh1*82ieu#){?
zQ~ear+Mt@=5IGFiUe5z&*woBSAZgI}g#&rZ@rxbLPX`rW05w4mn0GiMx)1Iz+HGxZ
z>-L;?n18EGA`Nh;+u*DX!fHNu)Sq5jdb+wkF15F}S6+eUGl<^PfdJrw<2tc8I5?bd
z@9qTt;mtBdp0-*Zs#hE`*xCtIT*#_^*lSU{Tz|Q3i0w7J7}un9w)-qvZCkMq4MPgb
z@Fx6y@?jL?B>8N&`0KwQorNjBg|4NV&y`MN)s~O>iF#Vijz@ED_nc1!HLKAu&;Uxe
zSR2z9L3%Db@lpB?lVYCpENzjbZ9_Ppw6PoC<s)<GS*4lG)&_6aTP+iBo#HYP!hC*H
zb3%M0KT+TFAzd-lq$Ki46~m#{K0$R_|M^f|ndId>=xm2#u$0g$8V-;Fy$YvRuJLCR
zX)ecW;g3-ek5-u_Ht&`!!+PtGO1fE)Wq!Z+*k6@q%&Qw88|v7>b!R7Wd^o@uo8$`g
z@h@id@sE&J52_^k1VghW27&ciZB5mDOyT&%1<it~5a9JaC@_%Nkz4eC9-?Ob{JF_v
zGDpk~tP_$G+RJ68)pV#@FL<va5)zN_7+?G-Ju=i5i*8?O%l&`lP<MizGqyQakM^Dw
z$cqf=oC@MwxJ(Y!nk_eQ84TiF<12a=f86?kqy&D@!UHyn^)`<+pJ_!$t{qmz**De5
zR`F{@rMiE}A1{*b0i2ff8@`WAM9E}@IOG~rnkx&xKfN;HY_-Lij-kFaAsA=?1tX3L
zioh&4+;guR+4=RAmnGZbrr1=~3>!<J@R~p;%(<a7`1jjH`Yq_HR~q+Sx?81e$YaY@
z_yDYspN8AqxeRVMR|Ks74GB6(?VV*xW`}k5HG$}j^Bm2+^^~}(58fMuvQ(^<s>s)+
zk(Fch+c?r4?PGE=YA%{Gn9%>-rOB!tD%RhunW`3i_4A+N6a1RN5;N4*g7DuUIDK5o
zOD0(pr%xX(>y&Aq@gL%cNi~vNLopEntNJ0rS;S}dsSXpg88H#1r~cL1z<-MujHC+K
z?GIBa;Ga0PPR3~xagm!TS56JkX4-i|P;i2sYB1JT_InIZJ2Y|ir<{=YZ(cZnID;i!
z*et!29JTTh1>p^!6okebMulbkHgUSAEEG7jG7B?<_isvfVg9sK+dqnB|J6n@RE3sB
z^d{7S(T7#|K;>WLJ0BugXwbeEj3XCwxPlWC-|?rn`v^X2{?!#ouxxLC@I<pLMwNsQ
z2s@K+m-|_*AdfkO|Ko2U@s>0zdJC$!o3x4pjY`<V|1?&BK|Rvc$c}rC|C|0E#RRGW
z&_Xba*(dP23?sYj`$yFO{$n8u((>A>{gDThkH$p6luk312*vmF0p!Vbs$co~Pn~=C
zy1fCL6$It4gl?t*4GpSFg7Tl*9P~Q^uDc=#(%$?G#0Ibp1Nvgh_|k~>zm5NYi$)&P
zEm6g?aFz~v3cnnui@&*L60KVtt$>h9(myL#Ylg9YC2F$Oer*B8P;dwXL81u`25K1v
zzK%R+txu5`sv^wm+PF~n>#`V>@FH{dDvz~og84O7PPBeCE3u)0vF%8;WCBtI#^6qf
z9b>_baEw<MEMtNnV~R*>aDu*U?J+sd!kR0eB05YqBIT}jiAFX3NjQ~mP5kgq@xx1S
zbG$dgMsi|^TnB4IMB7p$t@x;1kNqG{4tC;*l}rPM)JI`;EJ;dCKa?!ODnydv#H>x}
zCAz?Pt(VM}GI7$qWlGXGB+bNLyP03^;K_3%_w9RfMK&{TZxwVBi}qymXWo!Gorv78
zHD;w&YeKZkfjF?4RGqJ#887c9qb2r4m2_pkEO$o6={$Y-vr?5F#l7CeU%CauyAqT*
zish}qJ&wkAgptHA<ghP<GmtLIQFv5WU)pZ-4te)RG}ZcFs&MJaCD9tUEC3EGyF-zT
zpmo>rlX_0ByQ?n!oRzhspK+);QD%bvd3IB(u-X|)+8qT{_BDmyWgns};Wr-$ZjO=s
z#m*1Uvcgo~FQ&D(^f)6?ASRxM)Z12uTWsM)?CF)=bV9H6{aLqQxnqkOGMPYq530$8
zC@d!ab<CiDrhG7<Ay<EeGx@Ae`Co09y6tEW)2F<?*M;or6cS0P*3?Un+K|qcFPgsJ
zIG_>oM{95k&m@QqqFYnVofzd<MjBRI{Ch8*+Ar+=9@@J^^kG2K`kY1Ql&mhl_X9eT
z-TeA$ppp0x2M7cb-9y)*c=~Jb155#AQuqYkyYz$2^qwVh=Fd(byo)C}%+3Sj9TAoK
zp5aXA#h-n-;7H@<WL3i>$09+`5U-IoKcZX$A|uz&9XKv*B)ZH?D{L(@2fQ%Z$JZaN
z9be_1)ApM>HpHm=w22U(iQq1q2=kdAD5+TPy>mZEDFdPCYkG3ybIcy8{&P^1@(Fu~
zZ!n0>hy7~=it>2VS;0u1{#FB-Ej=;YhGdYRf_P|+$opY=%#&xHOv|enGXyINg^_V3
zr?_6bMVFbUj8~DFZs!4vaLS2Lh0RPsio#m4LQ^@6lNXU-<1oB#2YD0M;zBRP(a6)n
z<2&oz%Y}B<)rmfK0H0y%vWk{!jni2DO)-1)d8^R(lc0SfEpe%K0=*=D5oLjUD|*zk
zP}6VWhA05!Y|0ou6xH6Rr!3BE^a2=J7Du2ExEnO)(j;2!dlksPam54DjsyP*HUO@4
z_IR2MGS|nB%LeoNB}!i>nB;b`IO!{xzl74Qhi<o%EQ%KE9!t;Oe{VtF3iUyyYl>o&
zna|347HR6l62U=Gm9NYFg&Xv7zbu-MvGjANj_yjydvE}IX?=0Qp5JkJ+VhG8TcITN
ztBgbCyFHd>sPtUg;tY2~<oJAN0R_0_Gglg2cB5=5EhY$W(U^5NzV2|k_ou7y++O?I
z86T5FW!HXhA9H1hf_f$p*be_5W0s8fTiWE2mT7&*)?bNj9Q=!4#^eD+;2Zzeom^^g
zZm@BoM|WRe)A@Om*-zWA7R8;053%c8R44c8Zg5AyYGakk?!u(F*7(;xrf*EA+4;9p
zv227_@5+Z!$h~uwpdISRD`e8R-SJ6b^qp0!)`Z62AwEqR&}Zr&?Tv!yI*#OE`2uBx
z0C7SNvZb-A-o{K)a9fDRkAcDKOt;termx+QaH`!&tjO#DkhBO*K_637J(Wzp0d^KX
zr#McPr0M;K6^1w$w3?Pz|Dmm?wh~2CQowLNu}Vjn`iXI3&VMqDnehE&wylUd6zI3j
zAOG?;Hg|U<pTc)m+actmVo_(>;63D{W^_rw`>4p1P$^qT40ahC9Ddj#et>idZ--Mt
zWpmnT5y}k)b^g?yg6^rv(<wzkstIyZ)YKCaV@&~8-~9uFz3uNIkTq7{bT~+ba!DKA
z)s`Mdl!urJ27xq`u*H6l%1X?cb(CR%U2I`dhK-b-B5m@uz;nXO!{C<6uT$-tKw*z?
z00p)#bWYtQa@U>HPU@msKf&g^W8sgU#N(~!cfY>(qenvTfTUrm|4s*}w-0-LGRjb;
ztqt?G7b6oG-(kK#9%Fe_&HZ8ugq0+k&S}W~k!Vnra6JtHGO`#g7DT`8H*a&Iv;;}z
zJjx9l;DdcoZ54y+XMdkM9mzCjyakL>hepahiMQ*%1oJ;_d!bwUHYWilHi9|(?z9Ot
z8N$~-TT~S*$i7N2bOGsM)7y8JD5^Klivm&+lB1sqx6d+-PUa@q&<|x+3%{425)D#w
z(y4(-_cco-IhjY;;ka1g>*N44%we~YLF-r)an@z=UKghr!B=45DS|=lHD~&^R_q^W
zpYW-a`C3yH8U-5I<LT~3z$eRtXt$qMMjTn8jGU|<;U*{h!)@UsMP<EhTnnd?C;WEh
zE?b_r;Ds9`x^FRo$(3kxKZ(v4td8A1U0rQ5Wi)HwK}44*9p{#iI4i>H3z#g}f)<Nt
z(ZZkRXO0IPrlX#TgZ3DaYYa>8_G<4yzaW(GN7!rp*g`KK^nh8xgH~T-p8Is0JL1I9
z&-AUq^BSu<n*$=WTUn>|F58OEh?hi?q~=!A9jl`qPMP}HLtKComi{LeC7)y*+#AfW
zk$A%d+f@BqZ|hk-5zGkmzHufB(Q?67veA%hCKc0(3+-W;U*qS4e$V4yb=)tH`57z{
z3(;<6R2h81{BZZdyk?w)@alopC=2<)ua%ijxC}tdc9RABUi%YE-vRWG?=%zlnL4&H
znSVyF9`g|XV3@nl8QRyuqGq}z3v?xN*!73@vPXpP?%xl7OvyN1kyjjOALJiuAL4J|
zz4tic9jIt6R$jP!&Y~{*&f(LSp>AHop$mo_;D#^nba!h$F6Q<h?5OwCCGL%Hj|HI~
zJsuo3l;@SM)%yxqDR^0l&5rjps?bj>kEa!^j;G~NNEDVb-x|l%S`8aE+dknhHF{=g
z5nJRW+uJy0br!B4SY-y!V58t<ct7@*YPgovawIs6_Ti@3@`ExQt%g_ixerr6p$oW%
z6aU($CF!^i8YO@~aOSt=XVNm>>-d9(_3p9d^^T{_cHy;<LE!psr8aV{&7)i(nEHEx
zIGXaGiF=Xl;tU~t$XA_lYfQI%0+La5J7Lc?&(vCF0WWOzp`V9Lc$)~98WRhpwi>s!
zO;;CK*IPW~bVOp`PMe>&hW5sYtz6N}zh&Puw!??yH8OdTbqObllFVF47*XKbE31sv
zcW3rN_UGn6Lye|-?G?0OdlZCRGrQ~DOthd|Q8{&zMaM4=Zp!$f<73JvuAYck23RJ)
z$EUdoLg9(c>lq&FB!RSpytAMs>im#3(7)d~Gf&tL%<g1M(llo#1Jdu^6Zd7s;EsN;
zcbv1R@Ff%%E5&5qQUJlE6fX5dz@=(2Bl<3u02~p>xX#4y@M+n+VPPq(a??IH`y;my
z_crvUsfg{dV2$o%r5F$naG<$YJ?J6D*3;a=PCst1m57V~P;nl8uldp1G~mZSifls1
zd&tKqy(|Z4<<vv`ew#;iuKl|^v72v>I702O;v7ma)KzSRhUjuI5D_R~7AIJz8Dj!h
z1~57jnaW@3R4bpg+sm3f^^EFT$~5&;O}6R;%2x&yx8miFRi%3Hfee7Ft0E<3J1Y3&
zhi$SW@oqt{P;RRq(;|xzJXkqx_w@W={1k&NGYX_^#*ANUHoxK;qM`h&BYt`WaqmCo
z-QP!+sw?u$E?jxc+mfWNO<?>#2q^|A{kiG?JG2F#V+X&*3C!F@sIq|+(<pInl@G9k
z2Rr59N_4)s*0EpRj^BkF!1-@B4MJ^Lt8PCS#?<4M?(JJ2u#Hmgs<Q%PGPxk+<BTv<
zG$E=BK^BkJ|D>!9SDwuBR>Y~}3Aj9^(oP$#%S*W9tecSd`m%y>=Ji{6iZr_&^QrZ8
z9SG>gxnF1#-B7j(Xuj<sw?v#3YVw7e;Tp0Ivbi+4Fz8oaYke?!Uh-_-J-KBGB|9tf
z+I4PF!Rh^Vxh^+({-?%%@>Gm%o8VJ<pxs!8nY#9>dhBB<ECP0z&Hv=x28!X-g?4v|
zzu3anQ;vbOlkqb*cS522AJMQN_L=pb2oPUJy{TA&CPC(iGIe|&l?;2F<++v>#T<=1
z(RM>JzSsV$1x5VFtiSTdb~t22F@g+Xh8w}`l-rW2n&$`b7~wm^CoYh}#fNAws9Fd`
z=lEDXeN1)Kj@=R1KgDEr^!d1DVg|9sWWU&%CX36FBt=te)LvgpL#5mP%ZET9zd#9~
z+Y}F|neQbh{@DFdIx8t^7uHVkOPB>MdG4yOLLVC+PMT}KPkyWw&K1V<)<RbfemaoG
zKE2QW0X7InhiL_gli`kHP<`tY0U|K`or6B1ngItjOfTfe&eMuwk~}4W7b*u*%PRkS
zfA&ayK_195nQbF{>Lh0H;iGYHDV#t1(jp=l-=CeZ&|Ev8G;R`x%dM7Hz6DF_%Or09
zkGGH=Nip=PsNX2oru_p&D}S=2$>w4da|2R#_!c}=cDSD_BRBHpO%IM5SEVh_>;nt*
z%yA9$JJ8T4YG|<iW)^YSC`7iFA%;e&5d*JZR2b+mL-RwB>cWg{*2tM7u4%3ZBW*OI
z-h<>7vs1)p1QSAKzA9$4(yHQQK~E?4rD^M1fu>)%yKUZ|$pCR%&a8Nz(JP-;{6@_Y
zwhMFlPH-w?WEw=b2*oXe0skk{!QdiZ0!<3y^{K#AOWORIczldKeU_>4ENww>K?Rlp
zeA4-(ef{pB_rHiM0%hQ_fll;8zWkNxqE-i1ko#o8Hx0iX0~<R8A}K+&`#~}H25mtq
z4)=cEkbb|-`^mQk%-pu=?97)|4XMK!|D0Q7qL-y^nWEffQSc(6-mu))Moq_hPQqjJ
zgt6mHwi@r>`q|Iheh{G0*X#MvYpWT!%8fZ-(!XrSNyl6`r#~$|&gKAuUQtBInI3C4
z!5v+lpmV$fD;N_kB`1^bT)9*BX}7aF52Z-aNVSJ1{VT6z5ktHwZgCouDmA(q+g|#K
zC9x7i@c96FZM`IDf1MH<!6bG=>onnzN~>$UC!&4kQh^(V)s<SlTcU>3-905TGpT?B
z5+Ly~v~>?BAg*j!hk{US?2E%Pq|zSK7}pWkXzD0nwK2XoMB|Xi%(b^07;OB31au`F
zeW)!x(=t+uWP%UGH7>zhu0NYGk=R4Zg{J$n^E580S@XY!FU<^6QOWaijhcqI!F|bx
z3VyH_uG20ewL4$K4!W*zdvA9J*fT$l$fe(u9)1%InHeg_i10T^0Sx>jP)o%_lve*~
zuSh)1Bkf1Mpj!q(cHv$4gd)G)3`W7iu02ae@ef0r)fCTW$dpOERdQeMX!2lmy>4pU
zv$V|$GlsA%+)O+Pb{N6`yZKInoTAj&d0b{Mhu|{Sx_aq(Sfynwxuxjc@8DsF{w<tr
zc2e;y!#$7Qy_v5l2y0-nDAj!UxiGW;r+!iL{N0jRM^h{UvSDpc(&wR2@=Ms8Wn=dn
zST);x6p1)rvI<h0Jw`8%$w9NN%PfnQni{dCx+hA$n-L5A&qf&&!<CS_=h%3w*&+Vs
ze?+DGC+cOCE^`7?oq?u(@)A6GZdEg#^uc)qp}SxFl{n7v?T^+i;uUZnf-gb}<)=h=
zBV*HUmq2otH&b4ZFJwy(+fuHtZrl@dOkouE+QiH(I9JgTdt3^pR}p%>w9}HEF0SPx
z&BK;*O-%;*D1~cCn#i`c3HxTRJ_Eis9>ZUgy<T2~c=!z0FpMcUeh!Ms>{E~|h>G}?
zd#GiPz<mD9zB2bc7LgxL@A^;XW~4I(*6}n>;Tr$9GTMZG|2dtn4#q)$PKPXRpV0}k
zSKU)q5&s1w_U%XbX+G}5gX?}iSIaK`iM7I(GDz2J{zz`o8O40a!2SL>CV=_Jf_2$6
z75{Ae(WwU!MGVq)k4nbNnX`VOStfz17-}yE7Da0~ekN+|XXASJqEQ@HcRZLz@sEK@
zEz4!UkQLXF+8MsBVJriPOum3~+!}={7R$62W%hm$ZUhaunP&-%YR5c2xC}_Ul8U|a
z6p_ei88LN9WmZU7Ux}88l1od=7LllC;)^{<lWzKV6?I3P_w{&q2;1G5g#CkQ;nMB<
z$msw|FI%>@ldUoGJR=}Hha*CSYZyrgDrlCR&$<j@?c6d*EC!KXP%j|%LFQKle}|}H
z=qf4eG37E+^8JDe_EFc+&bi&o9?ZCrdolT5yJ%M%J*;RGhk9YYMr9(+*3XJ3b0uD`
zde3Rp9l}12V*s^<OPK`+<jI$(;Cnxn0)O|4nd^vDdv3I;O5G-3X0KtT!;^^HDBVa&
zla|ZNCX@bc$*Tjt!h>Wp3G?a@-iv<uz%K#2A`{2=A@#ua?IDrkY()DtmQEm`;tp2W
zVn{yAi>pJeD+=kOgEGx@Y@P!>#v|FKCr(d;?w_=ZX2W;oJ9kx%0kfr#`yP;mabWE)
z#MLL>Iw~&QkDu>iajZ9|UCI1A(j!H`D-voM#+#|<L`<cwzqU!cPmJyJv*UMBnL*k&
z7~J!Kr+?`XYr*TV_V)z0mGKQ)8GGt*e!js6Tpjf>)}HfP_#59NYy&8tE)u{j<v-x>
zn-2jGDgdLI9W~n@q#m(wvkh0$)*H>*vFvS|SKkc@oR<h|%EJAe=cPW+Fol1}HTqt8
zSr%G)o<K0CmcV;e(_zsK<#Ecfybs%89j;2b`jXz_@|)kSU#<BB%&kPtG_^&<++s|Z
zUSrYOV%N@@NR+F&<`8hbi5j=^Go9JK3d`5~@m;Y-bJ2g<bRhhg2*|p2um?IvH`At8
zU3+;L2G@DLCR6VG>j!M(*$jfUroi=lJuxZ0_oLfC(<%+t?z+3LhuQ-Qw`@9od=`*#
zK^u%N(jT~Lurcj>aFObGZ$(SuK0i-amt3hyAu62}4?i}`BHFu|B+Y9iHU9%NB)NBS
z{LSqpc)us3#zjO)BCv)sXL{VZoaK`Z#?3jGY-(3_w{mOABntK~+ixxrw!N1d623@H
zj9)YVrGoKI*!db$-t%92f7K|zz!tU`RS9r#fH>yRw42Y=4gJn=maPeuj2tAgPVbL_
zj5eLTMkwvAEwK@PU5ZxopQ;dni7jfFPVC*ovTANh$6<AXg8sZ(K`3R3Gnj#`O%?-v
zg=vQE&o1{URNwG|v;O$wj3-oRx1~<bdPP>fLh6t&M)urqr|s;q#=6%U;wb_Yta3Oj
z*_z{VZ^S0V1&N_!;)k{nJhTNQL$V`mlLALUz}ibj+B;|5jVgLsC+>fXx#1_#R8xM1
zLAr;Qe?LNIKbx2)CP^R;Z2uShXBzDX3-4>{C);5(jB>+}w^vV!Il7mKshx8ZB%~hK
zFR))a@<6gwK&`>iG)`Y+50vheIz$%v+q(>g^Ru1k^7jzEio3Fwn3z=S>k{GQw~ER8
zuYr{e+WdX%bBnv$5uxIUaTcbVoGh)SW<JOQXWQDVZQy5?4$C+KQ9y+W<NKDbX@`qK
z+RRva*8MhuqqEp_uFHqO;^<thxmXnPxQ$^tSg=PJOX)Qnmq<DpARtgyR2Ph6RWL)9
zxh-({PeUI2=+VLw_T`QW%%%3w7ZDjhcx15O0YQ^4Yi!ixm?01b1PzG#+fumvg)iD$
zaaMM6NHTp;hJ!3gCRyvQ7hJBMM0ay?aOIdV4Z3!^&FRTmyhxz`C5AavOAYO{k9X>e
zsaQO(a7Muzm8lwCdsR#!S{)BlJQo@A8>XFZ*gr1o-H0is9?pl+4<pQn9Otny7d$3R
zWVH@6k;IEk06wXXmu^^;=9D;#KnX636QadtAGNg(uU>D7K$^Bc5-phGn*rB`EAjmu
z4zRdo=eKvyOHU;(TrB1gClsOw4LY!(w!acfGp?0|g1!TVpBaSZ56U}#JUDOs)(c{`
zWV{bDJo&qHq>E)U>8uZL{G#gZ7cW936Hp%W0tF?hAGR#cp3$h(+f`YxG)jRQfSRI%
zdJbo6ST(v=q_lhJ0m^{`$qfo~wu6l`p+N!zj7y-HT~`r>Bo|GHXv}+?d*v@I#oj$1
zM1Y!$jql<V0lJdY9!a&voM#+kZzk`_$Bp@|$H05Tkmeji-}%XVprA!JUbt`>@*YD5
zOT@QQ30239CcoZ&M)a<Ehz7w#{j2lISi<e9#3D`mE?vS@iWh0z0a4k?wbadmhnC*1
z7ifD|*3&g6^qot^%nIo%=Z*fYl=Rm3P;ptzw-QP4d<am5RKB&v7!D}>XI&Xn?68BN
z?9VX>_9;Vfw=ejeS`utT2F`Wty)b<kh&FyTdBq@KWbEX=_EV^bE{PCHKobyNByzqi
z{CkzXl1PAZu;v+)Dp-x7FT+6*$ACVIdj(m1kJFb!wOO<<$TjHmy*+r^>Rr!oyf;5e
z+7Lfjn0EKut8oW^Nz<Uu+(Dp?KlqnBq8I71l{;!28uiIhXKDK=Ozc+OUy&HCl8{U5
zk=0}8l-r9C1zER9KjAZ*|5RENYgg>$Kv>-K;Mqm=f{M(`K(r!#y20O(^S`DkVsT)8
zM_jhw?u`VZkXuk##>x+%PUK#zT|{^h`a3bSsj0O;q9}nds<;LMq!+{b%679RY%WkW
z|5LJTuCw0d9Q|^BMhA9kw1V5U&ZA)fhlz5EX;7)03f9mL1vNQ%{;jg&#W(!svSqr_
z<`on)C{h(#is%od+Xc%zxs8wtUJIbgi9N}_s;m7R>)h~U{m9UoV15rLOpBVC)ws%V
z(vnyWR5vTNQ=UJ4T}i{QW0A=pq!-lK$WgSrs0~u+>t3ZV-MM(?eBK~ZN#ZeyUoYTc
z2s<5ejnSYVo%vXDgDk8$3`dm#7aHfbeZ}c!KEL89I?hdtLQaYfJ+MbW&k$=gxk{?i
zH!DONk&0PEM4$O9(3JQIX@@2%^`yvPZEzlQN95bD>;9?`!~-;cc1l`KZON?jl?L<O
zfR6sU;Q$RwyAaXP?UrTx%(&T$Zx#{Aw87rM#sMZ+m$&B_Ve}M2z7u)cn{FFLA~ZgP
zT<rV=re&+0%*7Go22zG4PVK-)EuP0uqx=sNahabii-KHNrO_)2)*7Dq^T*m$D-ATh
z698L)<q4<t&irm(+J-w8Isw<L@5DIjHH<W~2fYMEd!ge>mRC$Ac(y@6Wz%UuG^Lhc
zM|oWFG}%V!ben~tk~n2sd!}6l?(GD@ZHGj`uG>)&J?a7lNYXit$$6$CE@0!_ZdquZ
z_Xmes7Sn5^F45dfNAu(U-H^wYvYh4VcDMfmdUh2QQtW{na-nbi1>Vtbi9*^6Dr>u-
zILj?ev@RG)Kv#5K?sqYWQt8QJO)CasXu+6l;bSkd^|seVL!7`p0yd32o)=T>E3nz9
z3T02V$s5V<keO*IQ#O15g#A`_go0PKqW+zk)75^aEF^k$J<P;%f)mgXU&r-;-3{z4
z;?^3|mG(NKXgTnDC-Axrf%<9~P35!>i<!K_MJKGvm*&(^Blw~?qMh%lHCD@CF?uPz
zGQf)s;W1%gMayTdxb}_bPnJIjY~A1k6_$9NSO2+q#z@oLDqZwksqChT<R9D8k4Gwh
zPRzG6NU3zbboMkh&|kav!ltffkJ1r{d*_Q)J=M%eoOYNCNAi&x*Cua!ipd>zx4c!7
z*^7qYOvkzZtf;rmU!fiWv<jSk^JEG#0Eydt9*<W-RS<ASJqN@^Endf;z<IeKE>Nmx
zo~nWcI0#I@&pKuJe&7)Yz$p&NQF;Hj@&BUn|Is%PFo&v{X}-a~aWhazH%eWEge|<+
zfBr{Z*`xt>L|$kc&<Nh%{{a4&^k+t(q$P*f?)4M>t-Zguc4_PNNTP~HwgZwemo9T+
z)I(%A62K+^vHE+<l$PN4oqnEfU!%`<;C3o_=22UUlg`ieL{$JN7f>(-pr7Wd<{qhc
zZBu%PCLB-7%s62|sRzOQz&+Be*v?k901PSl1}zNfl#Gm*<h>%=|A<b02*x#wLE5%7
z;R=r>=TV=lE`%A-vRK|YC$-6f|De&Jx!t+sZlsFf`t>YSssHS$(SGm*<ks`{2?3Ng
zD7bL4&cfBGg6RY8MKTQ0j;|0^-{MV6%_ItGi(?cy5l$YS$By)PNk4#M<}C$Bh+ikz
zf`6e%#3r4YRa<h!TjHJ+MPF&%!@Bez39SY3d~(~GKgAuqY#W-#!NgqDYA10?uQD}C
zs8|ABauH1-(XKN}3Xq7PU;;tG(y0*tsp6vQ;Zq0<N-Ef9ZPdB*)l!Iz{cX@73g}77
z$pRkc#=6n;N{2fv>5e}ppz)L4RGao#o8t{zG6B0cZWNGi*Gh7Rpt>H;y1STrr3oJt
z=NZ7eLoWJdoL3#^JGN*x^bxIyP~V6(q=qm#LOEhNQe;6Dr5<$if`<hW^lC0<W!C#e
z+_U#V0+4^l0AcOrfE{hn__EdV9p-=V`*;&ddG7J9H=RspzFdFg-gD$Uxb9;5ed=CU
zjwz@LigQNFlXmM<*K;wk+#5^x`ohY3Zo$QB_-1=^8fed_-O9?2m&ey?v+)e_<qJ$H
zv*gB{%OR!)1+^<{gE+J?_R3mJiCMLs@0)LYHuX&BH5dJ@<tueMdC(j3f^l&7w3o%t
zPj_BBUC1nP1Yl_h#E`B0P({lSQPsd9A2--ApXzm-E>fxBQtuDYmD~<)Pj`3snRcD!
zED>YUyj^!Kr#PSuln)L<6+ceKCzs3ZhWSeUS6E_+kW6(()3hD>Gi;e;xI%L^v7Z%|
zr?1i=)nty!DQSfK2<et1%b|{o2ph(h=i6m3kBiM-@Hy-ufs6L=Jp245p2!g1e?$F=
zk+e;~*?<4fb`dQqDoViaZq@m98(IIpi?%`8clU#Ee1d_>(yH976r<4W_>PVXm34_y
z@2Oq<U1++=Y3=r^iD9?q?ud+*Z%O9xzgGbIRnboQT9qaar$VYTW-O;uJJsEADkh<u
z%;AgIRp&O<0PUhQmw2^5*B3IS7b-eio$diGD^1EJEPy^fW7Hcr&Sx|4<DKg56PvDt
zM=CwcQw#!>-d|&iRI)p3vzVpv<{qjh56P4{O_Yu;qFDg;;zfjej^KSgRpp^|ntR9(
zh$*oz^g!eZ7+W1E9Rt{ZV++X%7nEnJ1&5RgSxX~3mRBW&0L4pi59=pV@^LwUn4awd
zyO=_qx=Ta3Wz#xFz9oqATZvrnDL<fnr6CJVx}(rd3DJKFl975{>3Q9i$o5wE(-VCt
zZLacnUj{!GMWW=vDdf*?C{;`u5GkLi2yoT6=v<!i%)SRidAGsMthdh-Hy!~)M<W=%
zFDd6eF>w>p#Jjk#++w_vE@j6KQv^V<%hS`V6F~v!u6%H5In-_^iOvb7wY*Mu>Nj#J
zdM2}vu7ztQ+1ev{E1J8Bw}&MAAm<|W%0AJzCz9b>IXg9XWs#xd)&JBm(lR+>rakXU
z>%5{f#7&LT1zO@cCv%+1mfm`9eLAAjows#{-+o)YeZAM$+gnzW(PMEwjX5DDs3(_{
z_LU>$qio~!xIUCz@E|VwDDWzp5vl-wog|;Nw%($RtThT2?P0Ps;BmV_RK_WYSZ-G*
zaVGe$KR<76$co#J>KU{Bo=JF>iM89TdyViLulCCi&Dr7ye|3TX+cL~Mv8d^8qV($m
z`^VwZ^5s5XcLu``|3lGDLn_hU;CzcJx+0{KGmt~b&^s-Kbe0*l-eSF1fYD1N@eZ)z
zJVp_XUHRM-OgW8lJCQE7K_B9DAJ-4AW$E=pQpq<OpHx;x=ey5D1vW{*sTsMzs+H&j
zz6C)eRuK@4_wivOg7qk@V4>?}%Cv|YW?y`GBcuVB%0;ZD|5<)p>60t++hL(-k?jM}
zl>@fVK<}g!3mQgPcY%FoG(bwM$^;n9lM(%tlk9`IV4An_Z<1xHg0>dLG~T^UT{P13
bSLg^)<^}nj2S<Rt4J9QeCt4x=&G-KRL=e7U

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_happy_face.png b/app/src/main/res/drawable-xxhdpi/ic_happy_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..7654a958aa27417fecb26abb8f62b00cdd6f23d8
GIT binary patch
literal 6499
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
JPDHLkV1g2vks|;A

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_sad_face.png b/app/src/main/res/drawable-xxhdpi/ic_sad_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..db6f4bc40a4bbca9b64a971388ace6f9b347cb18
GIT binary patch
literal 6535
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/button_happy_dark_theme.png b/app/src/main/res/drawable-xxxhdpi/button_happy_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e31c6f8f2da2f3c7a4f38c6fb7208bf6e34bff0
GIT binary patch
literal 17442
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/button_happy_light_theme.png b/app/src/main/res/drawable-xxxhdpi/button_happy_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..f565ed2e34dbd5abd189d7a3170238ea321eac02
GIT binary patch
literal 16757
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
Drr^Nb

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/button_sad_dark_theme.png b/app/src/main/res/drawable-xxxhdpi/button_sad_dark_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..c743cb193279bb17b0501c1799177b305a95e72e
GIT binary patch
literal 17474
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
R_$UaHl$g9|$tS(9{~ssrC=&nx

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/button_sad_light_theme.png b/app/src/main/res/drawable-xxxhdpi/button_sad_light_theme.png
new file mode 100644
index 0000000000000000000000000000000000000000..be34f2c118e01111cf92757bb3c8ffb2aae2d3cf
GIT binary patch
literal 16843
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
aAizn0x>rHM5BPTmEO}WKnX>05LH`%<CbQ}Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_happy_face.png b/app/src/main/res/drawable-xxxhdpi/ic_happy_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f767f69a02cf34a5e35d5659a92edbf8a03686
GIT binary patch
literal 9015
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sad_face.png b/app/src/main/res/drawable-xxxhdpi/ic_sad_face.png
new file mode 100644
index 0000000000000000000000000000000000000000..652315cc9384c33f4ed335e706e42a9ddddb54f3
GIT binary patch
literal 9038
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
A%K!iX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_button_happy_dark_theme.xml b/app/src/main/res/drawable/ic_button_happy_dark_theme.xml
deleted file mode 100644
index 4eab541bb5aa..000000000000
--- a/app/src/main/res/drawable/ic_button_happy_dark_theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="108"
-    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#333" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,64.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_button_happy_light_theme.xml b/app/src/main/res/drawable/ic_button_happy_light_theme.xml
deleted file mode 100644
index a93467835666..000000000000
--- a/app/src/main/res/drawable/ic_button_happy_light_theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="108"
-    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,64.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_button_sad_dark_theme.xml b/app/src/main/res/drawable/ic_button_sad_dark_theme.xml
deleted file mode 100644
index ee587ae59948..000000000000
--- a/app/src/main/res/drawable/ic_button_sad_dark_theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="108"
-    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#333" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,57.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_button_sad_light_theme.xml b/app/src/main/res/drawable/ic_button_sad_light_theme.xml
deleted file mode 100644
index 91ae4565ece8..000000000000
--- a/app/src/main/res/drawable/ic_button_sad_light_theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="108"
-    android:viewportWidth="108" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M10,2L98,2A6,6 0,0 1,104 8L104,96A6,6 0,0 1,98 102L10,102A6,6 0,0 1,4 96L4,8A6,6 0,0 1,10 2z"/>
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M54,52m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M63.6,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM44.4,50.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M67.92,32.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C38.8,72 45.92,76 54,76c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M54,57.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_negative_feedback.xml b/app/src/main/res/drawable/ic_negative_feedback.xml
deleted file mode 100644
index 590f16d5c187..000000000000
--- a/app/src/main/res/drawable/ic_negative_feedback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M33.6,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM14.4,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M37.92,4.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C8.8,44 15.92,48 24,48c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M24,29.6c3.52,0 6.8,1.04 8.96,2.72 0.72,0.56 0.8,1.52 0.24,2.24 -0.56,0.72 -1.52,0.8 -2.24,0.24 -1.6,-1.28 -4.24,-2.08 -7.04,-2.08s-5.36,0.8 -7.04,2.08c-0.72,0.56 -1.68,0.4 -2.24,-0.24 -0.56,-0.72 -0.4,-1.68 0.24,-2.24 2.32,-1.68 5.6,-2.72 9.12,-2.72z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_positive_feedback.xml b/app/src/main/res/drawable/ic_positive_feedback.xml
deleted file mode 100644
index f7581e9947a1..000000000000
--- a/app/src/main/res/drawable/ic_positive_feedback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="48"
-    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFB652" android:fillType="evenOdd" android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M33.6,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4zM14.4,22.4c1.36,0 2.4,-1.04 2.4,-2.4 0,-1.36 -1.04,-2.4 -2.4,-2.4 -1.36,0 -2.4,1.04 -2.4,2.4 0,1.36 1.04,2.4 2.4,2.4z"/>
-    <path android:fillColor="#F1A031" android:fillType="evenOdd" android:pathData="M37.92,4.48c2.8,3.92 4.48,8.72 4.48,13.92 0,13.28 -10.72,24 -24,24 -5.2,0 -10,-1.68 -13.92,-4.48C8.8,44 15.92,48 24,48c13.28,0 24,-10.72 24,-24 0,-8.08 -4,-15.2 -10.08,-19.52z"/>
-    <path android:fillColor="#733321" android:fillType="evenOdd" android:pathData="M24,36.8c-3.52,0 -6.8,-1.04 -8.96,-2.72 -0.72,-0.56 -0.8,-1.52 -0.24,-2.24 0.56,-0.72 1.52,-0.8 2.24,-0.24 1.6,1.28 4.24,2.08 7.04,2.08s5.36,-0.8 7.04,-2.08c0.72,-0.56 1.68,-0.4 2.24,0.24 0.56,0.72 0.4,1.68 -0.24,2.24 -2.32,1.68 -5.6,2.72 -9.12,2.72z"/>
-</vector>
diff --git a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
index 9a8150cfe55b..38dbcb64c080 100644
--- a/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_negative_broken_site_feedback.xml
@@ -21,6 +21,7 @@
     xmlns:toots="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/rootScrollView"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout style="@style/FeedbackFragmentStyle">
@@ -31,7 +32,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_negative_feedback"
+            android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
index 66a949d40690..a32a2d15a811 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_main_reason.xml
@@ -31,7 +31,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_negative_feedback"
+            android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
index cf2ea4e68779..75917a9a2c17 100644
--- a/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
+++ b/app/src/main/res/layout/content_feedback_negative_disambiguation_sub_reason.xml
@@ -31,7 +31,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_negative_feedback"
+            android:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
index 79743af94226..0ee1abc6844e 100644
--- a/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
+++ b/app/src/main/res/layout/content_feedback_open_ended_feedback.xml
@@ -32,7 +32,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_negative_feedback"
+            tools:src="@drawable/ic_sad_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/content_feedback_positive_landing.xml b/app/src/main/res/layout/content_feedback_positive_landing.xml
index bd77a6865509..061ee59d5ca8 100644
--- a/app/src/main/res/layout/content_feedback_positive_landing.xml
+++ b/app/src/main/res/layout/content_feedback_positive_landing.xml
@@ -30,7 +30,7 @@
             android:layout_height="48dp"
             android:layout_marginTop="@dimen/feedbackTitleMarginTop"
             android:importantForAccessibility="no"
-            android:src="@drawable/ic_positive_feedback"
+            android:src="@drawable/ic_happy_face"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

From 38a178301a5e509f43b72df0a3cf5fd62aa1181d Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 20 Mar 2019 17:36:36 +0000
Subject: [PATCH 15/47] Start integration with server for submitting feedback

Also renamed old "feedback" classes to "broken site" naming
---
 app/build.gradle                              |  3 +-
 .../app/feedback/api/SurveyDownloaderTest.kt  |  3 +
 .../feedback/ui/BrokenSiteViewModelTest.kt    | 14 +--
 .../app/brokensite/BrokenSiteViewModel.kt     |  8 +-
 .../api/BrokenSiteSender.kt}                  | 16 ++--
 .../app/brokensite/api/BrokenSiteService.kt   | 49 ++++++++++
 .../app/di/AppConfigurationDownloadModule.kt  |  2 +-
 .../com/duckduckgo/app/di/NetworkModule.kt    | 32 +++++--
 .../app/feedback/api/FeedbackService.kt       | 41 +++------
 .../app/feedback/api/FeedbackSubmitter.kt     | 84 +++++++++++++++++
 .../app/feedback/api/SubReasonApiMapper.kt    | 90 +++++++++++++++++++
 .../feedback/ui/common/FeedbackActivity.kt    |  4 +-
 .../feedback/ui/common/FeedbackViewModel.kt   | 19 +++-
 .../app/feedback/ui/negative/FeedbackType.kt  |  3 +-
 ...ShareOpenEndedNegativeFeedbackViewModel.kt | 15 ++--
 .../duckduckgo/app/global/ViewModelFactory.kt | 13 +--
 .../app/job/AppConfigurationDownloader.kt     |  2 +-
 .../duckduckgo/app/statistics/pixels/Pixel.kt |  4 +-
 .../api/SurveyDownloader.kt                   |  6 +-
 .../{feedback => survey}/api/SurveyGroup.kt   |  4 +-
 .../{feedback => survey}/api/SurveyService.kt |  4 +-
 21 files changed, 334 insertions(+), 82 deletions(-)
 rename app/src/main/java/com/duckduckgo/app/{feedback/api/FeedbackSender.kt => brokensite/api/BrokenSiteSender.kt} (86%)
 create mode 100644 app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/api/SurveyDownloader.kt (95%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/api/SurveyGroup.kt (91%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/api/SurveyService.kt (91%)

diff --git a/app/build.gradle b/app/build.gradle
index ff090d54386e..3120ee42fe69 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,7 +111,7 @@ ext {
     okHttp = "3.10.0"
     rxJava = "2.1.10"
     rxAndroid = "2.0.2"
-    timber = "4.6.1"
+    timber = "4.7.1"
     rxRelay = "2.0.0"
     leakCanary = "1.6.2"
     mockito = "2.18.3"
@@ -136,6 +136,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
     implementation "io.reactivex.rxjava2:rxjava:$rxJava"
     implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
     implementation "com.jakewharton.timber:timber:$timber"
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt
index 1760ec5fbe39..e66d2e1ccc22 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt
@@ -21,6 +21,9 @@ import com.duckduckgo.app.feedback.db.SurveyDao
 import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.feedback.model.Survey.Status.NOT_ALLOCATED
 import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
+import com.duckduckgo.app.survey.api.SurveyDownloader
+import com.duckduckgo.app.survey.api.SurveyGroup
+import com.duckduckgo.app.survey.api.SurveyService
 import com.nhaarman.mockitokotlin2.*
 import okhttp3.ResponseBody
 import org.junit.Rule
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
index 5c5a376399fd..f5d32f609ca4 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.Observer
 import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.brokensite.BrokenSiteViewModel
 import com.duckduckgo.app.brokensite.BrokenSiteViewModel.Command
-import com.duckduckgo.app.feedback.api.FeedbackSender
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
@@ -29,7 +29,7 @@ class BrokenSiteViewModelTest {
     val schedulers = InstantSchedulersRule()
 
     @Mock
-    private lateinit var mockFeedbackSender: FeedbackSender
+    private lateinit var mockBrokenSiteSender: BrokenSiteSender
 
     @Mock
     private lateinit var mockCommandObserver: Observer<BrokenSiteViewModel.Command>
@@ -42,7 +42,7 @@ class BrokenSiteViewModelTest {
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
-        testee = com.duckduckgo.app.brokensite.BrokenSiteViewModel(mockFeedbackSender)
+        testee = com.duckduckgo.app.brokensite.BrokenSiteViewModel(mockBrokenSiteSender)
         testee.command.observeForever(mockCommandObserver)
     }
 
@@ -138,7 +138,7 @@ class BrokenSiteViewModelTest {
         testee.onFeedbackMessageChanged(message)
         testee.onSubmitPressed()
 
-        verify(mockFeedbackSender).submitBrokenSiteFeedback(message, url)
+        verify(mockBrokenSiteSender).submitBrokenSiteFeedback(message, url)
         verify(mockCommandObserver).onChanged(Command.ConfirmAndFinish)
     }
 
@@ -146,7 +146,7 @@ class BrokenSiteViewModelTest {
     fun whenCannotSubmitBrokenSiteAndSubmitPressedThenFeedbackNotSubmitted() {
         testee.onBrokenSiteChanged(true)
         testee.onSubmitPressed()
-        verify(mockFeedbackSender, never()).submitBrokenSiteFeedback(any(), any())
+        verify(mockBrokenSiteSender, never()).submitBrokenSiteFeedback(any(), any())
         verify(mockCommandObserver, never()).onChanged(Command.ConfirmAndFinish)
     }
 
@@ -155,7 +155,7 @@ class BrokenSiteViewModelTest {
         testee.onBrokenSiteChanged(false)
         testee.onFeedbackMessageChanged(message)
         testee.onSubmitPressed()
-        verify(mockFeedbackSender).submitGeneralFeedback(message)
+        verify(mockBrokenSiteSender).submitGeneralFeedback(message)
         verify(mockCommandObserver).onChanged(Command.ConfirmAndFinish)
     }
 
@@ -163,7 +163,7 @@ class BrokenSiteViewModelTest {
     fun whenCannotSubmitMessageAndSubmitPressedThenFeedbackNotSubmitted() {
         testee.onBrokenSiteChanged(false)
         testee.onSubmitPressed()
-        verify(mockFeedbackSender, never()).submitGeneralFeedback(any())
+        verify(mockBrokenSiteSender, never()).submitGeneralFeedback(any())
         verify(mockCommandObserver, never()).onChanged(Command.ConfirmAndFinish)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
index 43edee020e01..95a34d747b11 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
@@ -18,11 +18,11 @@ package com.duckduckgo.app.brokensite
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.feedback.api.FeedbackSender
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
 import com.duckduckgo.app.global.SingleLiveEvent
 
 
-class BrokenSiteViewModel(private val feedbackSender: FeedbackSender) : ViewModel() {
+class BrokenSiteViewModel(private val brokenSiteSender: BrokenSiteSender) : ViewModel() {
 
     data class ViewState(
         val isBrokenSite: Boolean = false,
@@ -103,9 +103,9 @@ class BrokenSiteViewModel(private val feedbackSender: FeedbackSender) : ViewMode
 
         if (viewValue.isBrokenSite) {
             val url = viewValue.url ?: return
-            feedbackSender.submitBrokenSiteFeedback(message, url)
+            brokenSiteSender.submitBrokenSiteFeedback(message, url)
         } else {
-            feedbackSender.submitGeneralFeedback(message)
+            brokenSiteSender.submitGeneralFeedback(message)
         }
 
         command.value = Command.ConfirmAndFinish
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
similarity index 86%
rename from app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSender.kt
rename to app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index da966783c90a..eabeabd90103 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.api
+package com.duckduckgo.app.brokensite.api
 
 import android.annotation.SuppressLint
 import android.os.Build
+import com.duckduckgo.app.brokensite.api.BrokenSiteService.Platform
+import com.duckduckgo.app.brokensite.api.BrokenSiteService.Reason
 import com.duckduckgo.app.browser.BuildConfig
-import com.duckduckgo.app.feedback.api.FeedbackService.Platform
-import com.duckduckgo.app.feedback.api.FeedbackService.Reason
 import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
 
-interface FeedbackSender {
+interface BrokenSiteSender {
     fun submitGeneralFeedback(comment: String)
     fun submitBrokenSiteFeedback(comment: String, url: String)
 }
 
-class FeedbackSubmitter(
+class BrokenSiteSubmitter(
     private val statisticsStore: StatisticsDataStore,
     private val variantManager: VariantManager,
-    private val service: FeedbackService
-) : FeedbackSender {
+    private val service: BrokenSiteService
+) : BrokenSiteSender {
 
     @SuppressLint("CheckResult")
     override fun submitGeneralFeedback(comment: String) {
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt
new file mode 100644
index 000000000000..96ba628e2c80
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt
@@ -0,0 +1,49 @@
+/*
+ * 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.brokensite.api
+
+import io.reactivex.Observable
+import okhttp3.ResponseBody
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.POST
+
+interface BrokenSiteService {
+
+    object Platform {
+        const val ANDROID = "Android"
+    }
+
+    object Reason {
+        const val BROKEN_SITE = "broken_site"
+        const val GENERAL = "general"
+    }
+
+    @FormUrlEncoded
+    @POST("/feedback.js?type=app-feedback")
+    fun feedback(
+        @Field("reason") reason: String,
+        @Field("url") url: String,
+        @Field("comment") comment: String,
+        @Field("platform") platform: String,
+        @Field("os") api: Int,
+        @Field("manufacturer") manufacturer: String,
+        @Field("model") model: String,
+        @Field("v") appVersion: String,
+        @Field("atb") atb: String
+    ): Observable<ResponseBody>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt b/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt
index e23c485a022c..8ebf5331b159 100644
--- a/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/AppConfigurationDownloadModule.kt
@@ -17,7 +17,7 @@
 package com.duckduckgo.app.di
 
 import com.duckduckgo.app.entities.api.EntityListDownloader
-import com.duckduckgo.app.feedback.api.SurveyDownloader
+import com.duckduckgo.app.survey.api.SurveyDownloader
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.httpsupgrade.api.HttpsUpgradeDataDownloader
 import com.duckduckgo.app.job.AppConfigurationDownloader
diff --git a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
index d85d7254f52e..88fa6ff8caec 100644
--- a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
@@ -19,11 +19,14 @@ package com.duckduckgo.app.di
 import android.app.job.JobScheduler
 import android.content.Context
 import com.duckduckgo.app.autocomplete.api.AutoCompleteService
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
+import com.duckduckgo.app.brokensite.api.BrokenSiteService
+import com.duckduckgo.app.brokensite.api.BrokenSiteSubmitter
 import com.duckduckgo.app.entities.api.EntityListService
-import com.duckduckgo.app.feedback.api.FeedbackSender
 import com.duckduckgo.app.feedback.api.FeedbackService
 import com.duckduckgo.app.feedback.api.FeedbackSubmitter
-import com.duckduckgo.app.feedback.api.SurveyService
+import com.duckduckgo.app.feedback.api.FireAndForgetFeedbackSubmitter
+import com.duckduckgo.app.feedback.api.SubReasonApiMapper
 import com.duckduckgo.app.global.AppUrl.Url
 import com.duckduckgo.app.global.api.ApiRequestInterceptor
 import com.duckduckgo.app.global.job.JobBuilder
@@ -31,9 +34,12 @@ import com.duckduckgo.app.httpsupgrade.api.HttpsUpgradeService
 import com.duckduckgo.app.job.AppConfigurationSyncer
 import com.duckduckgo.app.job.ConfigurationDownloader
 import com.duckduckgo.app.statistics.VariantManager
+import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import com.duckduckgo.app.surrogates.api.ResourceSurrogateListService
+import com.duckduckgo.app.survey.api.SurveyService
 import com.duckduckgo.app.trackerdetection.api.TrackerListService
+import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
@@ -77,6 +83,7 @@ class NetworkModule {
             .baseUrl(Url.API)
             .client(okHttpClient)
             .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+            .addCallAdapterFactory(CoroutineCallAdapterFactory())
             .addConverterFactory(MoshiConverterFactory.create(moshi))
             .build()
     }
@@ -114,21 +121,34 @@ class NetworkModule {
         retrofit.create(ResourceSurrogateListService::class.java)
 
     @Provides
-    fun feedbackService(@Named("api") retrofit: Retrofit): FeedbackService =
-        retrofit.create(FeedbackService::class.java)
+    fun brokenSiteService(@Named("api") retrofit: Retrofit): BrokenSiteService =
+        retrofit.create(BrokenSiteService::class.java)
 
     @Provides
     fun entityListService(@Named("api") retrofit: Retrofit): EntityListService =
         retrofit.create(EntityListService::class.java)
 
     @Provides
-    fun feedbackSender(statisticsStore: StatisticsDataStore, variantManager: VariantManager, feedbackSerice: FeedbackService): FeedbackSender =
-        FeedbackSubmitter(statisticsStore, variantManager, feedbackSerice)
+    fun brokenSiteSender(
+        statisticsStore: StatisticsDataStore,
+        variantManager: VariantManager,
+        brokenSiteSerice: BrokenSiteService
+    ): BrokenSiteSender =
+        BrokenSiteSubmitter(statisticsStore, variantManager, brokenSiteSerice)
 
     @Provides
     fun surveyService(@Named("api") retrofit: Retrofit): SurveyService =
         retrofit.create(SurveyService::class.java)
 
+    @Provides
+    fun feedbackSubmitter(feedbackService: FeedbackService, variantManager: VariantManager, apiKeyMapper: SubReasonApiMapper, pixel: Pixel): FeedbackSubmitter =
+        FireAndForgetFeedbackSubmitter(feedbackService, variantManager, apiKeyMapper, pixel)
+
+    @Provides
+    fun feedbackService(@Named("api") retrofit: Retrofit): FeedbackService =
+        retrofit.create(FeedbackService::class.java)
+
+
     @Provides
     @Singleton
     fun appConfigurationSyncer(
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
index b9a3cfe0264e..8af6f64b4b7c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,19 @@
 
 package com.duckduckgo.app.feedback.api
 
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
-import retrofit2.http.POST
+import kotlinx.coroutines.Deferred
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-interface FeedbackService {
-
-    object Platform {
-        const val ANDROID = "Android"
-    }
 
-    object Reason {
-        const val BROKEN_SITE = "broken_site"
-        const val GENERAL = "general"
-    }
+interface FeedbackService {
 
-    @FormUrlEncoded
-    @POST("/feedback.js?type=app-feedback")
-    fun feedback(
-        @Field("reason") reason: String,
-        @Field("url") url: String,
-        @Field("comment") comment: String,
-        @Field("platform") platform: String,
-        @Field("os") api: Int,
-        @Field("manufacturer") manufacturer: String,
-        @Field("model") model: String,
-        @Field("v") appVersion: String,
-        @Field("atb") atb: String
-    ): Observable<ResponseBody>
+    @GET("https://duckduckgo.com/collect.js?type=app-feedback&platform=android")
+    fun submit(
+        @Query("category") category: String?,
+        @Query("subcategory") subcategory: String?,
+        @Query("comment") comment: String,
+        @Query("v") version: String
+    ): Deferred<Response<Void>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
new file mode 100644
index 000000000000..4f10d07d270a
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2019 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.feedback.api
+
+import com.duckduckgo.app.browser.BuildConfig
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
+import com.duckduckgo.app.statistics.VariantManager
+import com.duckduckgo.app.statistics.pixels.Pixel
+import timber.log.Timber
+import java.util.*
+
+
+interface FeedbackSubmitter {
+
+    suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String)
+    suspend fun sendPositiveFeedback(openEnded: String)
+}
+
+class FireAndForgetFeedbackSubmitter(
+    private val feedbackService: FeedbackService,
+    private val variantManager: VariantManager,
+    private val apiKeyMapper: SubReasonApiMapper,
+    private val pixel: Pixel
+) : FeedbackSubmitter {
+    override suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String) {
+        val category = categoryFromMainReason(mainReason)
+        val subcategory = apiKeyMapper.apiKeyFromSubReason(subReason)
+
+        kotlin.runCatching { feedbackService.submit(category, subcategory, openEnded, version()).await() }
+            .onSuccess { Timber.i("Successfully submitted feedback") }
+            .onFailure { Timber.w(it, "Failed to send feedback") }
+
+        val pixelName = pixelFromReasons(category, subcategory)
+
+        Timber.i("will eventually fire pixel: $pixelName")
+        //pixel.fire(pixelName)
+    }
+
+    override suspend fun sendPositiveFeedback(openEnded: String) {
+        kotlin.runCatching { feedbackService.submit(null, null, openEnded, version()).await() }
+            .onSuccess { Timber.i("Successfully submitted feedback") }
+            .onFailure { Timber.w("Failed to send feedback") }
+    }
+
+    private fun categoryFromMainReason(mainReason: MainReason): String {
+        return when (mainReason) {
+            MainReason.MISSING_BROWSING_FEATURES -> "browser_features"
+            MainReason.SEARCH_NOT_GOOD_ENOUGH -> "bad_results"
+            MainReason.NOT_ENOUGH_CUSTOMIZATIONS -> "customization"
+            MainReason.APP_IS_SLOW_OR_BUGGY -> "performance"
+            MainReason.OTHER -> "other"
+            else -> "unknown"
+        }
+    }
+
+    private fun pixelFromReasons(category: String, subcategory: String): String {
+        val formattedPixel = String.format(Locale.US, Pixel.PixelName.FEEDBACK_SUBMISSION.pixelName, category, subcategory)
+        Timber.i("Formatted pixel as [$formattedPixel]")
+        return formattedPixel
+    }
+
+
+
+    private fun version(): String {
+        val variantKey = variantManager.getVariant().key
+        val formattedVariantKey = if (variantKey.isBlank()) " " else " $variantKey "
+        return "${BuildConfig.VERSION_NAME}$formattedVariantKey"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt
new file mode 100644
index 000000000000..ce38ffd84691
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/SubReasonApiMapper.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2019 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.feedback.api
+
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.CustomizationSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReasons.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
+import javax.inject.Inject
+
+
+class SubReasonApiMapper @Inject constructor() {
+
+    fun apiKeyFromSubReason(subReason: FeedbackType.SubReason?): String {
+        return when (subReason) {
+            is FeedbackType.MissingBrowserFeaturesSubReasons -> browserFeaturesSubReason(subReason)
+            is FeedbackType.SearchNotGoodEnoughSubReasons -> searchNotGoodEnoughSubReason(subReason)
+            is FeedbackType.CustomizationSubReasons -> customizationSubReason(subReason)
+            is FeedbackType.PerformanceSubReasons -> performanceSubReasons(subReason)
+            else -> GENERIC
+        }
+    }
+
+    private fun browserFeaturesSubReason(subReason: FeedbackType.MissingBrowserFeaturesSubReasons): String {
+        return when (subReason) {
+            NAVIGATION_ISSUES -> "navigation"
+            TAB_MANAGEMENT -> "tabs"
+            AD_POPUP_BLOCKING -> "ads"
+            WATCHING_VIDEOS -> "videos"
+            INTERACTING_IMAGES -> "images"
+            BOOKMARK_MANAGEMENT -> "bookmarks"
+            MissingBrowserFeaturesSubReasons.OTHER -> OTHER
+        }
+    }
+
+    private fun searchNotGoodEnoughSubReason(subReason: FeedbackType.SearchNotGoodEnoughSubReasons): String {
+        return when (subReason) {
+            PROGRAMMING_TECHNICAL_SEARCHES -> "technical"
+            LAYOUT_MORE_LIKE_GOOGLE -> "layout"
+            FASTER_LOAD_TIME -> "speed"
+            SEARCHING_IN_SPECIFIC_LANGUAGE -> "langRegion"
+            BETTER_AUTOCOMPLETE -> "autocomplete"
+            SearchNotGoodEnoughSubReasons.OTHER -> OTHER
+        }
+    }
+
+    private fun customizationSubReason(subReason: FeedbackType.CustomizationSubReasons): String {
+        return when (subReason) {
+            HOME_SCREEN_CONFIGURATION -> "home"
+            TAB_DISPLAY -> "tabs"
+            HOW_APP_LOOKS -> "ui"
+            WHICH_DATA_IS_CLEARED -> "whichDataCleared"
+            WHEN_DATA_IS_CLEARED -> "whenDataCleared"
+            BOOKMARK_DISPLAY -> "bookmarks"
+            CustomizationSubReasons.OTHER -> OTHER
+        }
+    }
+
+    private fun performanceSubReasons(subReason: FeedbackType.PerformanceSubReasons): String {
+        return when (subReason) {
+            SLOW_WEB_PAGE_LOADS -> "slow"
+            APP_CRASHES_OR_FREEZES -> "crash"
+            MEDIA_PLAYBACK_BUGS -> "video"
+            PerformanceSubReasons.OTHER -> OTHER
+        }
+    }
+
+    companion object {
+        private const val OTHER = "other"
+        private const val GENERIC = "submit"
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 057c4fc69c2e..47adf1f87f6e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -178,8 +178,8 @@ class FeedbackActivity : DuckDuckGoActivity(),
     /**
      * Negative feedback listeners
      */
-    override fun onProvidedNegativeOpenEndedFeedback(feedback: String) {
-        viewModel.onProvidedNegativeOpenEndedFeedback(feedback)
+    override fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        viewModel.onProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback)
     }
 
     /**
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 17e8e4b0c1b7..97682e69b13c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -18,17 +18,25 @@ package com.duckduckgo.app.feedback.ui.common
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
 import com.duckduckgo.app.browser.BuildConfig
+import com.duckduckgo.app.feedback.api.FeedbackSubmitter
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
 import com.duckduckgo.app.playstore.PlayStoreUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 
-class FeedbackViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
+class FeedbackViewModel(val playStoreUtils: PlayStoreUtils,
+                        val feedbackSubmitter: FeedbackSubmitter,
+                        val brokenSiteSubmitter: BrokenSiteSender
+) : ViewModel() {
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
@@ -154,8 +162,13 @@ class FeedbackViewModel(val playStoreUtils: PlayStoreUtils) : ViewModel() {
         )
     }
 
-    fun onProvidedNegativeOpenEndedFeedback(feedback: String) {
-        Timber.i("User provided negative feedback: {$feedback}")
+    fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        Timber.i("User provided negative feedback: {$feedback}. mainReason = $mainReason, subReason = $subReason")
+
+        GlobalScope.launch(Dispatchers.IO) {
+            feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
+        }
+
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
index 9cb0521c128d..031043ca6aa0 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackType.kt
@@ -29,8 +29,7 @@ sealed class FeedbackType {
         OTHER
     }
 
-    interface SubReason : Serializable {
-    }
+    interface SubReason : Serializable
 
     enum class MissingBrowserFeaturesSubReasons : SubReason {
         NAVIGATION_ISSUES,
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
index 2e56a054c733..b594bbe82ec5 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -17,6 +17,8 @@
 package com.duckduckgo.app.feedback.ui.negative.openended
 
 import androidx.lifecycle.ViewModel
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
 
 
@@ -24,16 +26,17 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
 
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
-    fun userSubmittingFeedback(feedback: String, isPositiveFeedback: Boolean) {
-        if (isPositiveFeedback) {
+    fun userSubmittingPositiveFeedback(feedback: String) {
             command.value = Command.ExitAndSubmitPositiveFeedback(feedback)
-        } else {
-            command.value = Command.ExitAndSubmitNegativeFeedback(feedback)
-        }
     }
 
+    fun userSubmittingNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEndedComment: String) {
+        command.value = Command.ExitAndSubmitNegativeFeedback(mainReason, subReason, openEndedComment)
+    }
+
+
     sealed class Command {
-        data class ExitAndSubmitNegativeFeedback(val feedback: String) : Command()
+        data class ExitAndSubmitNegativeFeedback(val mainReason: MainReason, val subReason: SubReason?, val feedback: String) : Command()
         data class ExitAndSubmitPositiveFeedback(val feedback: String) : Command()
         object Exit : Command()
     }
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 8d32d685e9a0..837aae5d7a55 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -22,6 +22,7 @@ import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
 import com.duckduckgo.app.bookmarks.db.BookmarksDao
 import com.duckduckgo.app.bookmarks.ui.BookmarksViewModel
 import com.duckduckgo.app.brokensite.BrokenSiteViewModel
+import com.duckduckgo.app.brokensite.api.BrokenSiteSender
 import com.duckduckgo.app.browser.*
 import com.duckduckgo.app.browser.addtohome.AddToHomeCapabilityDetector
 import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector
@@ -29,7 +30,7 @@ import com.duckduckgo.app.browser.favicon.FaviconDownloader
 import com.duckduckgo.app.browser.omnibar.QueryUrlConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.feedback.api.FeedbackSender
+import com.duckduckgo.app.feedback.api.FeedbackSubmitter
 import com.duckduckgo.app.feedback.db.SurveyDao
 import com.duckduckgo.app.feedback.ui.SurveyViewModel
 import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
@@ -86,7 +87,7 @@ class ViewModelFactory @Inject constructor(
     private val webViewLongPressHandler: LongPressHandler,
     private val defaultBrowserDetector: DefaultBrowserDetector,
     private val variantManager: VariantManager,
-    private val feedbackSender: FeedbackSender,
+    private val brokenSiteSender: BrokenSiteSender,
     private val webViewSessionStorage: WebViewSessionStorage,
     private val specialUrlDetector: SpecialUrlDetector,
     private val faviconDownloader: FaviconDownloader,
@@ -97,7 +98,9 @@ class ViewModelFactory @Inject constructor(
     private val appEnjoymentPromptEmitter: AppEnjoymentPromptEmitter,
     private val searchCountDao: SearchCountDao,
     private val appEnjoymentUserEventRecorder: AppEnjoymentUserEventRecorder,
-    private val playStoreUtils: PlayStoreUtils
+    private val playStoreUtils: PlayStoreUtils,
+    private val brokenSiteSubmitter: BrokenSiteSender,
+    private val feedbackSubmitter: FeedbackSubmitter
 ) : ViewModelProvider.NewInstanceFactory() {
 
     override fun <T : ViewModel> create(modelClass: Class<T>) =
@@ -112,8 +115,8 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(ScorecardViewModel::class.java) -> ScorecardViewModel(privacySettingsStore)
                 isAssignableFrom(TrackerNetworksViewModel::class.java) -> TrackerNetworksViewModel()
                 isAssignableFrom(PrivacyPracticesViewModel::class.java) -> PrivacyPracticesViewModel()
-                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(playStoreUtils)
-                isAssignableFrom(BrokenSiteViewModel::class.java) -> BrokenSiteViewModel(feedbackSender)
+                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(playStoreUtils, feedbackSubmitter, brokenSiteSubmitter)
+                isAssignableFrom(BrokenSiteViewModel::class.java) -> BrokenSiteViewModel(brokenSiteSender)
                 isAssignableFrom(SurveyViewModel::class.java) -> SurveyViewModel(surveyDao, statisticsStore, appInstallStore)
                 isAssignableFrom(AddWidgetInstructionsViewModel::class.java) -> AddWidgetInstructionsViewModel()
                 isAssignableFrom(SettingsViewModel::class.java) -> settingsViewModel()
diff --git a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt
index d9f2b8a8ce98..80887400d987 100644
--- a/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/job/AppConfigurationDownloader.kt
@@ -17,7 +17,7 @@
 package com.duckduckgo.app.job
 
 import com.duckduckgo.app.entities.api.EntityListDownloader
-import com.duckduckgo.app.feedback.api.SurveyDownloader
+import com.duckduckgo.app.survey.api.SurveyDownloader
 import com.duckduckgo.app.global.db.AppConfigurationEntity
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.httpsupgrade.api.HttpsUpgradeDataDownloader
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
index 954f9c989c97..6e0344096738 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
@@ -106,6 +106,8 @@ interface Pixel {
         APP_FEEDBACK_DIALOG_USER_GAVE_FEEDBACK("mrp_f_d%d_y"),
         APP_FEEDBACK_DIALOG_USER_DECLINED_FEEDBACK("mrp_f_d%d_n"),
         APP_FEEDBACK_DIALOG_USER_CANCELLED("mrp_f_d%d_c"),
+
+        FEEDBACK_SUBMISSION("mfbs")
     }
 
     object PixelParameter {
@@ -138,7 +140,7 @@ class ApiBasedPixel @Inject constructor(
             .subscribe({
                 Timber.v("Pixel sent: $pixelName")
             }, {
-                Timber.w("Pixel failed: $pixelName", it)
+                Timber.w(it, "Pixel failed: $pixelName")
             })
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyDownloader.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
similarity index 95%
rename from app/src/main/java/com/duckduckgo/app/feedback/api/SurveyDownloader.kt
rename to app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
index 4856d75995f1..9c980b3d393a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.api
+package com.duckduckgo.app.survey.api
 
-import com.duckduckgo.app.feedback.api.SurveyGroup.SurveyOption
+import com.duckduckgo.app.survey.api.SurveyGroup.SurveyOption
 import com.duckduckgo.app.feedback.db.SurveyDao
 import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.feedback.model.Survey.Status.NOT_ALLOCATED
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyGroup.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt
similarity index 91%
rename from app/src/main/java/com/duckduckgo/app/feedback/api/SurveyGroup.kt
rename to app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt
index 23127585a5a6..5f71490567ac 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyGroup.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyGroup.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.api
+package com.duckduckgo.app.survey.api
 
 
 data class SurveyGroup(val id: String, val surveyOptions: List<SurveyOption>) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyService.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt
similarity index 91%
rename from app/src/main/java/com/duckduckgo/app/feedback/api/SurveyService.kt
rename to app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt
index 466f904bb930..c3cd8ea893d1 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/SurveyService.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.api
+package com.duckduckgo.app.survey.api
 
 import retrofit2.Call
 import retrofit2.http.GET

From e0efb7e8db8b244aace9ad6be28642d944dd649d Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 21 Mar 2019 13:15:45 +0000
Subject: [PATCH 16/47] Send feedback and broken site reports, along with pixel
 for some cases

---
 .../com/duckduckgo/app/di/NetworkModule.kt    |   4 +-
 .../app/feedback/api/FeedbackService.kt       |  43 +++++--
 .../app/feedback/api/FeedbackSubmitter.kt     | 108 +++++++++++++++---
 .../feedback/ui/common/FeedbackViewModel.kt   |  18 +--
 .../duckduckgo/app/global/ViewModelFactory.kt |   3 +-
 .../duckduckgo/app/statistics/pixels/Pixel.kt |   3 +-
 6 files changed, 142 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
index 88fa6ff8caec..4a3a8962eb51 100644
--- a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
@@ -141,8 +141,8 @@ class NetworkModule {
         retrofit.create(SurveyService::class.java)
 
     @Provides
-    fun feedbackSubmitter(feedbackService: FeedbackService, variantManager: VariantManager, apiKeyMapper: SubReasonApiMapper, pixel: Pixel): FeedbackSubmitter =
-        FireAndForgetFeedbackSubmitter(feedbackService, variantManager, apiKeyMapper, pixel)
+    fun feedbackSubmitter(feedbackService: FeedbackService, variantManager: VariantManager, apiKeyMapper: SubReasonApiMapper, statisticsStore: StatisticsDataStore, pixel: Pixel): FeedbackSubmitter =
+        FireAndForgetFeedbackSubmitter(feedbackService, variantManager, apiKeyMapper, statisticsStore, pixel)
 
     @Provides
     fun feedbackService(@Named("api") retrofit: Retrofit): FeedbackService =
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
index 8af6f64b4b7c..620e69430f87 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
@@ -18,17 +18,44 @@ package com.duckduckgo.app.feedback.api
 
 import kotlinx.coroutines.Deferred
 import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Query
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.POST
 
 
 interface FeedbackService {
 
-    @GET("https://duckduckgo.com/collect.js?type=app-feedback&platform=android")
-    fun submit(
-        @Query("category") category: String?,
-        @Query("subcategory") subcategory: String?,
-        @Query("comment") comment: String,
-        @Query("v") version: String
+    @FormUrlEncoded
+    @POST("/feedback.js?type=app-feedback")
+    fun submitFeedbackAsync(
+        @Field("reason") reason: String = "general",
+        @Field("rating") rating: String,
+        @Field("category") category: String?,
+        @Field("subcategory") subcategory: String?,
+        @Field("comment") comment: String,
+        @Field("platform") platform: String = PLATFORM,
+        @Field("v") version: String,
+        @Field("os") api: Int,
+        @Field("manufacturer") manufacturer: String,
+        @Field("model") model: String,
+        @Field("atb") atb: String
     ): Deferred<Response<Void>>
+
+    @FormUrlEncoded
+    @POST("/feedback.js?type=app-feedback")
+    fun submitBrokenSiteAsync(
+        @Field("reason") reason: String = "broken_site",
+        @Field("comment") comment: String,
+        @Field("platform") platform: String = PLATFORM,
+        @Field("url") url: String? = null,
+        @Field("v") version: String,
+        @Field("os") api: Int,
+        @Field("manufacturer") manufacturer: String,
+        @Field("model") model: String,
+        @Field("atb") atb: String
+    ): Deferred<Response<Void>>
+
+    companion object {
+        private const val PLATFORM = "Android"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index 4f10d07d270a..e3047314d394 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -16,11 +16,17 @@
 
 package com.duckduckgo.app.feedback.api
 
+import android.os.Build
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.FEEDBACK_NEGATIVE_SUBMISSION
+import com.duckduckgo.app.statistics.store.StatisticsDataStore
+import kotlinx.coroutines.Deferred
+import retrofit2.Response
 import timber.log.Timber
 import java.util.*
 
@@ -29,56 +35,124 @@ interface FeedbackSubmitter {
 
     suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String)
     suspend fun sendPositiveFeedback(openEnded: String)
+    suspend fun sendBrokenSiteFeedback(openEnded: String, brokenSite: String?)
 }
 
 class FireAndForgetFeedbackSubmitter(
     private val feedbackService: FeedbackService,
     private val variantManager: VariantManager,
     private val apiKeyMapper: SubReasonApiMapper,
+    private val statisticsDataStore: StatisticsDataStore,
     private val pixel: Pixel
 ) : FeedbackSubmitter {
     override suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String) {
+        Timber.i("User provided negative feedback: {$openEnded}. mainReason = $mainReason, subReason = $subReason")
+
         val category = categoryFromMainReason(mainReason)
         val subcategory = apiKeyMapper.apiKeyFromSubReason(subReason)
 
-        kotlin.runCatching { feedbackService.submit(category, subcategory, openEnded, version()).await() }
+        sendPixel(pixelForNegativeFeedback(category, subcategory))
+
+        runCatching { submitFeedbackAsync(openEnded, NEGATIVE_FEEDBACK, category, subcategory).await() }
             .onSuccess { Timber.i("Successfully submitted feedback") }
             .onFailure { Timber.w(it, "Failed to send feedback") }
-
-        val pixelName = pixelFromReasons(category, subcategory)
-
-        Timber.i("will eventually fire pixel: $pixelName")
-        //pixel.fire(pixelName)
     }
 
     override suspend fun sendPositiveFeedback(openEnded: String) {
-        kotlin.runCatching { feedbackService.submit(null, null, openEnded, version()).await() }
+        Timber.i("User provided positive feedback: {$openEnded}")
+
+        sendPixel(pixelForPositiveFeedback())
+
+        runCatching { submitFeedbackAsync(openEnded, POSITIVE_FEEDBACK).await() }
             .onSuccess { Timber.i("Successfully submitted feedback") }
-            .onFailure { Timber.w("Failed to send feedback") }
+            .onFailure { Timber.w(it, "Failed to send feedback") }
+    }
+
+    override suspend fun sendBrokenSiteFeedback(openEnded: String, brokenSite: String?) {
+        Timber.i("User provided broken site report through feedback, url:{$brokenSite}, comment:{$openEnded}")
+
+        val category = categoryFromMainReason(WEBSITES_NOT_LOADING)
+        val subcategory = apiKeyMapper.apiKeyFromSubReason(null)
+        sendPixel(pixelForNegativeFeedback(category, subcategory))
+
+        runCatching {
+            submitBrokenSiteAsync(openEnded, brokenSite).await()
+        }
+            .onSuccess { Timber.i("Successfully submitted broken site feedback") }
+            .onFailure { Timber.w(it, "Failed to send broken site feedback") }
+    }
+
+    private fun sendPixel(pixelName: String) {
+        Timber.i("will fire pixel: $pixelName")
+        pixel.fire(pixelName)
+    }
+
+    private fun submitFeedbackAsync(
+        openEnded: String,
+        rating: String,
+        category: String? = null,
+        subcategory: String? = null
+    ): Deferred<Response<Void>> {
+        return feedbackService.submitFeedbackAsync(
+            category = category,
+            subcategory = subcategory,
+            rating = rating,
+            comment = openEnded,
+            version = version(),
+            manufacturer = Build.MANUFACTURER,
+            model = Build.MODEL,
+            api = Build.VERSION.SDK_INT,
+            atb = atbWithVariant()
+        )
+    }
+
+    private fun submitBrokenSiteAsync(openEnded: String, url: String?): Deferred<Response<Void>> {
+        return feedbackService.submitBrokenSiteAsync(
+            comment = openEnded,
+            url = url,
+            version = version(),
+            manufacturer = Build.MANUFACTURER,
+            model = Build.MODEL,
+            api = Build.VERSION.SDK_INT,
+            atb = atbWithVariant()
+        )
     }
 
     private fun categoryFromMainReason(mainReason: MainReason): String {
         return when (mainReason) {
-            MainReason.MISSING_BROWSING_FEATURES -> "browser_features"
-            MainReason.SEARCH_NOT_GOOD_ENOUGH -> "bad_results"
-            MainReason.NOT_ENOUGH_CUSTOMIZATIONS -> "customization"
-            MainReason.APP_IS_SLOW_OR_BUGGY -> "performance"
-            MainReason.OTHER -> "other"
-            else -> "unknown"
+            MISSING_BROWSING_FEATURES -> "browserFeatures"
+            WEBSITES_NOT_LOADING -> "brokenSites"
+            SEARCH_NOT_GOOD_ENOUGH -> "badResults"
+            NOT_ENOUGH_CUSTOMIZATIONS -> "customization"
+            APP_IS_SLOW_OR_BUGGY -> "performance"
+            OTHER -> "other"
         }
     }
 
-    private fun pixelFromReasons(category: String, subcategory: String): String {
-        val formattedPixel = String.format(Locale.US, Pixel.PixelName.FEEDBACK_SUBMISSION.pixelName, category, subcategory)
+    private fun pixelForNegativeFeedback(category: String, subcategory: String): String {
+        val formattedPixel = String.format(Locale.US, FEEDBACK_NEGATIVE_SUBMISSION.pixelName, NEGATIVE_FEEDBACK, category, subcategory)
         Timber.i("Formatted pixel as [$formattedPixel]")
         return formattedPixel
     }
 
-
+    private fun pixelForPositiveFeedback(): String {
+        val formattedPixel = String.format(Locale.US, Pixel.PixelName.FEEDBACK_POSITIVE_SUBMISSION.pixelName, POSITIVE_FEEDBACK)
+        Timber.i("Formatted pixel as [$formattedPixel]")
+        return formattedPixel
+    }
 
     private fun version(): String {
         val variantKey = variantManager.getVariant().key
         val formattedVariantKey = if (variantKey.isBlank()) " " else " $variantKey "
         return "${BuildConfig.VERSION_NAME}$formattedVariantKey"
     }
+
+    private fun atbWithVariant(): String {
+        return statisticsDataStore.atb?.formatWithVariant(variantManager.getVariant()) ?: ""
+    }
+
+    companion object {
+        private const val POSITIVE_FEEDBACK = "positive"
+        private const val NEGATIVE_FEEDBACK = "negative"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 97682e69b13c..2d2ca208fab9 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -18,7 +18,6 @@ package com.duckduckgo.app.feedback.ui.common
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.duckduckgo.app.brokensite.api.BrokenSiteSender
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.feedback.api.FeedbackSubmitter
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
@@ -33,10 +32,7 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 
 
-class FeedbackViewModel(val playStoreUtils: PlayStoreUtils,
-                        val feedbackSubmitter: FeedbackSubmitter,
-                        val brokenSiteSubmitter: BrokenSiteSender
-) : ViewModel() {
+class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val feedbackSubmitter: FeedbackSubmitter) : ViewModel() {
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
@@ -163,7 +159,6 @@ class FeedbackViewModel(val playStoreUtils: PlayStoreUtils,
     }
 
     fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        Timber.i("User provided negative feedback: {$feedback}. mainReason = $mainReason, subReason = $subReason")
 
         GlobalScope.launch(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
@@ -173,11 +168,20 @@ class FeedbackViewModel(val playStoreUtils: PlayStoreUtils,
     }
 
     fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
+
+        GlobalScope.launch(Dispatchers.IO) {
+            feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
+        }
+
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
-        Timber.i("User provided positive feedback: {$feedback}")
+
+        GlobalScope.launch(Dispatchers.IO) {
+            feedbackSubmitter.sendPositiveFeedback(feedback)
+        }
+
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index 837aae5d7a55..b8c826781adc 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -99,7 +99,6 @@ class ViewModelFactory @Inject constructor(
     private val searchCountDao: SearchCountDao,
     private val appEnjoymentUserEventRecorder: AppEnjoymentUserEventRecorder,
     private val playStoreUtils: PlayStoreUtils,
-    private val brokenSiteSubmitter: BrokenSiteSender,
     private val feedbackSubmitter: FeedbackSubmitter
 ) : ViewModelProvider.NewInstanceFactory() {
 
@@ -115,7 +114,7 @@ class ViewModelFactory @Inject constructor(
                 isAssignableFrom(ScorecardViewModel::class.java) -> ScorecardViewModel(privacySettingsStore)
                 isAssignableFrom(TrackerNetworksViewModel::class.java) -> TrackerNetworksViewModel()
                 isAssignableFrom(PrivacyPracticesViewModel::class.java) -> PrivacyPracticesViewModel()
-                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(playStoreUtils, feedbackSubmitter, brokenSiteSubmitter)
+                isAssignableFrom(FeedbackViewModel::class.java) -> FeedbackViewModel(playStoreUtils, feedbackSubmitter)
                 isAssignableFrom(BrokenSiteViewModel::class.java) -> BrokenSiteViewModel(brokenSiteSender)
                 isAssignableFrom(SurveyViewModel::class.java) -> SurveyViewModel(surveyDao, statisticsStore, appInstallStore)
                 isAssignableFrom(AddWidgetInstructionsViewModel::class.java) -> AddWidgetInstructionsViewModel()
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
index 6e0344096738..15cc184d625e 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
@@ -107,7 +107,8 @@ interface Pixel {
         APP_FEEDBACK_DIALOG_USER_DECLINED_FEEDBACK("mrp_f_d%d_n"),
         APP_FEEDBACK_DIALOG_USER_CANCELLED("mrp_f_d%d_c"),
 
-        FEEDBACK_SUBMISSION("mfbs")
+        FEEDBACK_POSITIVE_SUBMISSION("mfbs_%s_submit"),
+        FEEDBACK_NEGATIVE_SUBMISSION("mfbs_%s_%s_%s")
     }
 
     object PixelParameter {

From 6dc76c259f4b773c1a0a8eb1d0a4e21c83c21735 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 21 Mar 2019 15:55:03 +0000
Subject: [PATCH 17/47] Consolidated broken site and feedback services

---
 .../app/brokensite/api/BrokenSiteSender.kt    | 56 ++++++------
 .../app/brokensite/api/BrokenSiteService.kt   | 49 ----------
 .../duckduckgo/app/browser/BrowserActivity.kt |  2 -
 .../com/duckduckgo/app/di/NetworkModule.kt    | 65 ++++++-------
 .../app/feedback/api/FeedbackService.kt       |  6 +-
 .../app/feedback/api/FeedbackSubmitter.kt     | 88 +++++++++---------
 .../feedback/ui/common/FeedbackActivity.kt    |  7 +-
 .../feedback/ui/common/FeedbackViewModel.kt   | 91 +++++++++++--------
 .../PositiveFeedbackLandingFragment.kt        | 10 +-
 .../PositiveFeedbackLandingViewModel.kt       |  8 +-
 10 files changed, 170 insertions(+), 212 deletions(-)
 delete mode 100644 app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt

diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index eabeabd90103..cc268a7db5e5 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -16,14 +16,16 @@
 
 package com.duckduckgo.app.brokensite.api
 
-import android.annotation.SuppressLint
 import android.os.Build
-import com.duckduckgo.app.brokensite.api.BrokenSiteService.Platform
-import com.duckduckgo.app.brokensite.api.BrokenSiteService.Reason
 import com.duckduckgo.app.browser.BuildConfig
+import com.duckduckgo.app.feedback.api.FeedbackService
+import com.duckduckgo.app.feedback.api.FeedbackService.Companion.REASON_BROKEN_SITE
+import com.duckduckgo.app.feedback.api.FeedbackService.Companion.REASON_GENERAL
 import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
-import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 interface BrokenSiteSender {
@@ -32,38 +34,36 @@ interface BrokenSiteSender {
 }
 
 class BrokenSiteSubmitter(
-    private val statisticsStore: StatisticsDataStore,
-    private val variantManager: VariantManager,
-    private val service: BrokenSiteService
+        private val statisticsStore: StatisticsDataStore,
+        private val variantManager: VariantManager,
+        private val service: FeedbackService
 ) : BrokenSiteSender {
 
-    @SuppressLint("CheckResult")
     override fun submitGeneralFeedback(comment: String) {
-        submitFeedback(Reason.GENERAL, comment, "")
+        submitFeedback(comment = comment, reason = REASON_GENERAL)
     }
 
     override fun submitBrokenSiteFeedback(comment: String, url: String) {
-        submitFeedback(Reason.BROKEN_SITE, comment, url)
+        submitFeedback(comment, url, reason = REASON_BROKEN_SITE)
     }
 
-    private fun submitFeedback(type: String, comment: String, url: String) {
-        service.feedback(
-            type,
-            url,
-            comment,
-            Platform.ANDROID,
-            Build.VERSION.SDK_INT,
-            Build.MANUFACTURER,
-            Build.MODEL,
-            BuildConfig.VERSION_NAME,
-            atbWithVariant()
-        )
-            .subscribeOn(Schedulers.io())
-            .subscribe({
-                Timber.v("Feedback submission succeeded")
-            }, {
-                Timber.w("Feedback submission failed ${it.localizedMessage}")
-            })
+    private fun submitFeedback(comment: String, url: String? = null, reason: String) {
+        GlobalScope.launch(Dispatchers.IO) {
+
+            runCatching {
+                service.submitBrokenSiteAsync(
+                        reason = reason,
+                        url = url,
+                        comment = comment,
+                        api = Build.VERSION.SDK_INT,
+                        manufacturer = Build.MANUFACTURER,
+                        model = Build.MODEL,
+                        version = BuildConfig.VERSION_NAME,
+                        atb = atbWithVariant()).await()
+            }
+                    .onSuccess { Timber.v("Feedback submission succeeded") }
+                    .onFailure { Timber.w(it, "Feedback submission failed") }
+        }
     }
 
     private fun atbWithVariant(): String {
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt
deleted file mode 100644
index 96ba628e2c80..000000000000
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteService.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.brokensite.api
-
-import io.reactivex.Observable
-import okhttp3.ResponseBody
-import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
-import retrofit2.http.POST
-
-interface BrokenSiteService {
-
-    object Platform {
-        const val ANDROID = "Android"
-    }
-
-    object Reason {
-        const val BROKEN_SITE = "broken_site"
-        const val GENERAL = "general"
-    }
-
-    @FormUrlEncoded
-    @POST("/feedback.js?type=app-feedback")
-    fun feedback(
-        @Field("reason") reason: String,
-        @Field("url") url: String,
-        @Field("comment") comment: String,
-        @Field("platform") platform: String,
-        @Field("os") api: Int,
-        @Field("manufacturer") manufacturer: String,
-        @Field("model") model: String,
-        @Field("v") appVersion: String,
-        @Field("atb") atb: String
-    ): Observable<ResponseBody>
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
index 362235dad77e..411ffe71bc25 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
@@ -91,8 +91,6 @@ class BrowserActivity : DuckDuckGoActivity() {
             renderer.renderBrowserViewState(it)
         })
         viewModel.awaitClearDataFinishedNotification()
-
-        startActivity(SettingsActivity.intent(this))
     }
 
     override fun onNewIntent(intent: Intent?) {
diff --git a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
index 4a3a8962eb51..51673cbc11c4 100644
--- a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
@@ -20,7 +20,6 @@ import android.app.job.JobScheduler
 import android.content.Context
 import com.duckduckgo.app.autocomplete.api.AutoCompleteService
 import com.duckduckgo.app.brokensite.api.BrokenSiteSender
-import com.duckduckgo.app.brokensite.api.BrokenSiteService
 import com.duckduckgo.app.brokensite.api.BrokenSiteSubmitter
 import com.duckduckgo.app.entities.api.EntityListService
 import com.duckduckgo.app.feedback.api.FeedbackService
@@ -61,9 +60,9 @@ class NetworkModule {
     fun apiOkHttpClient(context: Context, apiRequestInterceptor: ApiRequestInterceptor): OkHttpClient {
         val cache = Cache(context.cacheDir, CACHE_SIZE)
         return OkHttpClient.Builder()
-            .addInterceptor(apiRequestInterceptor)
-            .cache(cache)
-            .build()
+                .addInterceptor(apiRequestInterceptor)
+                .cache(cache)
+                .build()
     }
 
     @Provides
@@ -71,8 +70,8 @@ class NetworkModule {
     @Named("pixel")
     fun pixelOkHttpClient(apiRequestInterceptor: ApiRequestInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
-            .addInterceptor(apiRequestInterceptor)
-            .build()
+                .addInterceptor(apiRequestInterceptor)
+                .build()
     }
 
     @Provides
@@ -80,12 +79,12 @@ class NetworkModule {
     @Named("api")
     fun apiRetrofit(@Named("api") okHttpClient: OkHttpClient, moshi: Moshi): Retrofit {
         return Retrofit.Builder()
-            .baseUrl(Url.API)
-            .client(okHttpClient)
-            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-            .addCallAdapterFactory(CoroutineCallAdapterFactory())
-            .addConverterFactory(MoshiConverterFactory.create(moshi))
-            .build()
+                .baseUrl(Url.API)
+                .client(okHttpClient)
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(CoroutineCallAdapterFactory())
+                .addConverterFactory(MoshiConverterFactory.create(moshi))
+                .build()
     }
 
     @Provides
@@ -93,10 +92,10 @@ class NetworkModule {
     @Named("pixel")
     fun pixelRetrofit(@Named("pixel") okHttpClient: OkHttpClient): Retrofit {
         return Retrofit.Builder()
-            .baseUrl(Url.PIXEL)
-            .client(okHttpClient)
-            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-            .build()
+                .baseUrl(Url.PIXEL)
+                .client(okHttpClient)
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .build()
     }
 
     @Provides
@@ -106,55 +105,47 @@ class NetworkModule {
 
     @Provides
     fun trackerListService(@Named("api") retrofit: Retrofit): TrackerListService =
-        retrofit.create(TrackerListService::class.java)
+            retrofit.create(TrackerListService::class.java)
 
     @Provides
     fun httpsUpgradeService(@Named("api") retrofit: Retrofit): HttpsUpgradeService =
-        retrofit.create(HttpsUpgradeService::class.java)
+            retrofit.create(HttpsUpgradeService::class.java)
 
     @Provides
     fun autoCompleteService(@Named("api") retrofit: Retrofit): AutoCompleteService =
-        retrofit.create(AutoCompleteService::class.java)
+            retrofit.create(AutoCompleteService::class.java)
 
     @Provides
     fun surrogatesService(@Named("api") retrofit: Retrofit): ResourceSurrogateListService =
-        retrofit.create(ResourceSurrogateListService::class.java)
-
-    @Provides
-    fun brokenSiteService(@Named("api") retrofit: Retrofit): BrokenSiteService =
-        retrofit.create(BrokenSiteService::class.java)
+            retrofit.create(ResourceSurrogateListService::class.java)
 
     @Provides
     fun entityListService(@Named("api") retrofit: Retrofit): EntityListService =
-        retrofit.create(EntityListService::class.java)
+            retrofit.create(EntityListService::class.java)
 
     @Provides
-    fun brokenSiteSender(
-        statisticsStore: StatisticsDataStore,
-        variantManager: VariantManager,
-        brokenSiteSerice: BrokenSiteService
-    ): BrokenSiteSender =
-        BrokenSiteSubmitter(statisticsStore, variantManager, brokenSiteSerice)
+    fun brokenSiteSender(statisticsStore: StatisticsDataStore, variantManager: VariantManager, feedbackService: FeedbackService): BrokenSiteSender =
+            BrokenSiteSubmitter(statisticsStore, variantManager, feedbackService)
 
     @Provides
     fun surveyService(@Named("api") retrofit: Retrofit): SurveyService =
-        retrofit.create(SurveyService::class.java)
+            retrofit.create(SurveyService::class.java)
 
     @Provides
     fun feedbackSubmitter(feedbackService: FeedbackService, variantManager: VariantManager, apiKeyMapper: SubReasonApiMapper, statisticsStore: StatisticsDataStore, pixel: Pixel): FeedbackSubmitter =
-        FireAndForgetFeedbackSubmitter(feedbackService, variantManager, apiKeyMapper, statisticsStore, pixel)
+            FireAndForgetFeedbackSubmitter(feedbackService, variantManager, apiKeyMapper, statisticsStore, pixel)
 
     @Provides
     fun feedbackService(@Named("api") retrofit: Retrofit): FeedbackService =
-        retrofit.create(FeedbackService::class.java)
+            retrofit.create(FeedbackService::class.java)
 
 
     @Provides
     @Singleton
     fun appConfigurationSyncer(
-        jobBuilder: JobBuilder,
-        jobScheduler: JobScheduler,
-        appConfigurationDownloader: ConfigurationDownloader
+            jobBuilder: JobBuilder,
+            jobScheduler: JobScheduler,
+            appConfigurationDownloader: ConfigurationDownloader
     ): AppConfigurationSyncer {
         return AppConfigurationSyncer(jobBuilder, jobScheduler, appConfigurationDownloader)
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
index 620e69430f87..1d4c726e6025 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
@@ -28,7 +28,7 @@ interface FeedbackService {
     @FormUrlEncoded
     @POST("/feedback.js?type=app-feedback")
     fun submitFeedbackAsync(
-        @Field("reason") reason: String = "general",
+        @Field("reason") reason: String = REASON_GENERAL,
         @Field("rating") rating: String,
         @Field("category") category: String?,
         @Field("subcategory") subcategory: String?,
@@ -44,7 +44,7 @@ interface FeedbackService {
     @FormUrlEncoded
     @POST("/feedback.js?type=app-feedback")
     fun submitBrokenSiteAsync(
-        @Field("reason") reason: String = "broken_site",
+        @Field("reason") reason: String = REASON_BROKEN_SITE,
         @Field("comment") comment: String,
         @Field("platform") platform: String = PLATFORM,
         @Field("url") url: String? = null,
@@ -56,6 +56,8 @@ interface FeedbackService {
     ): Deferred<Response<Void>>
 
     companion object {
+        const val REASON_GENERAL = "general"
+        const val REASON_BROKEN_SITE = "broken_site"
         private const val PLATFORM = "Android"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index e3047314d394..b9b631f92c15 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -34,16 +34,17 @@ import java.util.*
 interface FeedbackSubmitter {
 
     suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String)
-    suspend fun sendPositiveFeedback(openEnded: String)
+    suspend fun sendPositiveFeedback(openEnded: String?)
     suspend fun sendBrokenSiteFeedback(openEnded: String, brokenSite: String?)
+    suspend fun sendUserRated()
 }
 
 class FireAndForgetFeedbackSubmitter(
-    private val feedbackService: FeedbackService,
-    private val variantManager: VariantManager,
-    private val apiKeyMapper: SubReasonApiMapper,
-    private val statisticsDataStore: StatisticsDataStore,
-    private val pixel: Pixel
+        private val feedbackService: FeedbackService,
+        private val variantManager: VariantManager,
+        private val apiKeyMapper: SubReasonApiMapper,
+        private val statisticsDataStore: StatisticsDataStore,
+        private val pixel: Pixel
 ) : FeedbackSubmitter {
     override suspend fun sendNegativeFeedback(mainReason: MainReason, subReason: SubReason?, openEnded: String) {
         Timber.i("User provided negative feedback: {$openEnded}. mainReason = $mainReason, subReason = $subReason")
@@ -54,18 +55,20 @@ class FireAndForgetFeedbackSubmitter(
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
         runCatching { submitFeedbackAsync(openEnded, NEGATIVE_FEEDBACK, category, subcategory).await() }
-            .onSuccess { Timber.i("Successfully submitted feedback") }
-            .onFailure { Timber.w(it, "Failed to send feedback") }
+                .onSuccess { Timber.i("Successfully submitted feedback") }
+                .onFailure { Timber.w(it, "Failed to send feedback") }
     }
 
-    override suspend fun sendPositiveFeedback(openEnded: String) {
+    override suspend fun sendPositiveFeedback(openEnded: String?) {
         Timber.i("User provided positive feedback: {$openEnded}")
 
         sendPixel(pixelForPositiveFeedback())
 
-        runCatching { submitFeedbackAsync(openEnded, POSITIVE_FEEDBACK).await() }
-            .onSuccess { Timber.i("Successfully submitted feedback") }
-            .onFailure { Timber.w(it, "Failed to send feedback") }
+        if (!openEnded.isNullOrBlank()) {
+            runCatching { submitFeedbackAsync(openEnded, POSITIVE_FEEDBACK).await() }
+                    .onSuccess { Timber.i("Successfully submitted feedback") }
+                    .onFailure { Timber.w(it, "Failed to send feedback") }
+        }
     }
 
     override suspend fun sendBrokenSiteFeedback(openEnded: String, brokenSite: String?) {
@@ -78,43 +81,48 @@ class FireAndForgetFeedbackSubmitter(
         runCatching {
             submitBrokenSiteAsync(openEnded, brokenSite).await()
         }
-            .onSuccess { Timber.i("Successfully submitted broken site feedback") }
-            .onFailure { Timber.w(it, "Failed to send broken site feedback") }
+                .onSuccess { Timber.i("Successfully submitted broken sœite feedback") }
+                .onFailure { Timber.w(it, "Failed to send broken site feedback") }
+    }
+
+    override suspend fun sendUserRated() {
+        Timber.i("User indicated they'd rate the app")
+        sendPixel(pixelForPositiveFeedback())
     }
 
     private fun sendPixel(pixelName: String) {
-        Timber.i("will fire pixel: $pixelName")
+        Timber.d("Firing feedback pixel: $pixelName")
         pixel.fire(pixelName)
     }
 
     private fun submitFeedbackAsync(
-        openEnded: String,
-        rating: String,
-        category: String? = null,
-        subcategory: String? = null
+            openEnded: String,
+            rating: String,
+            category: String? = null,
+            subcategory: String? = null
     ): Deferred<Response<Void>> {
         return feedbackService.submitFeedbackAsync(
-            category = category,
-            subcategory = subcategory,
-            rating = rating,
-            comment = openEnded,
-            version = version(),
-            manufacturer = Build.MANUFACTURER,
-            model = Build.MODEL,
-            api = Build.VERSION.SDK_INT,
-            atb = atbWithVariant()
+                category = category,
+                subcategory = subcategory,
+                rating = rating,
+                comment = openEnded,
+                version = version(),
+                manufacturer = Build.MANUFACTURER,
+                model = Build.MODEL,
+                api = Build.VERSION.SDK_INT,
+                atb = atbWithVariant()
         )
     }
 
     private fun submitBrokenSiteAsync(openEnded: String, url: String?): Deferred<Response<Void>> {
         return feedbackService.submitBrokenSiteAsync(
-            comment = openEnded,
-            url = url,
-            version = version(),
-            manufacturer = Build.MANUFACTURER,
-            model = Build.MODEL,
-            api = Build.VERSION.SDK_INT,
-            atb = atbWithVariant()
+                comment = openEnded,
+                url = url,
+                version = version(),
+                manufacturer = Build.MANUFACTURER,
+                model = Build.MODEL,
+                api = Build.VERSION.SDK_INT,
+                atb = atbWithVariant()
         )
     }
 
@@ -130,21 +138,17 @@ class FireAndForgetFeedbackSubmitter(
     }
 
     private fun pixelForNegativeFeedback(category: String, subcategory: String): String {
-        val formattedPixel = String.format(Locale.US, FEEDBACK_NEGATIVE_SUBMISSION.pixelName, NEGATIVE_FEEDBACK, category, subcategory)
-        Timber.i("Formatted pixel as [$formattedPixel]")
-        return formattedPixel
+        return String.format(Locale.US, FEEDBACK_NEGATIVE_SUBMISSION.pixelName, NEGATIVE_FEEDBACK, category, subcategory)
     }
 
     private fun pixelForPositiveFeedback(): String {
-        val formattedPixel = String.format(Locale.US, Pixel.PixelName.FEEDBACK_POSITIVE_SUBMISSION.pixelName, POSITIVE_FEEDBACK)
-        Timber.i("Formatted pixel as [$formattedPixel]")
-        return formattedPixel
+        return String.format(Locale.US, Pixel.PixelName.FEEDBACK_POSITIVE_SUBMISSION.pixelName, POSITIVE_FEEDBACK)
     }
 
     private fun version(): String {
         val variantKey = variantManager.getVariant().key
         val formattedVariantKey = if (variantKey.isBlank()) " " else " $variantKey "
-        return "${BuildConfig.VERSION_NAME}$formattedVariantKey"
+        return "${BuildConfig.VERSION_NAME}$formattedVariantKey".trim()
     }
 
     private fun atbWithVariant(): String {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 47adf1f87f6e..86a130b44a16 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -162,14 +162,17 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Positive feedback listeners
      */
     override fun userSelectedToRateApp() {
-        Timber.i("User gave rating")
-        animateFinish(feedbackSubmitted = true)
+        viewModel.userSelectedToRateApp()
     }
 
     override fun userSelectedToGiveFeedback() {
         viewModel.userSelectedToGiveFeedback()
     }
 
+    override fun userGavePositiveFeedbackNoDetails() {
+        viewModel.onProvidedPositiveFeedbackNoDetails()
+    }
+
     override fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
         viewModel.onProvidedPositiveOpenEndedFeedback(feedback)
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 2d2ca208fab9..0d2db6b178fc 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -56,14 +56,13 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
             MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
         }
         viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = null,
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = newState,
+                mainReason = mainReason,
+                subReason = null,
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
-
     fun onBackPressed() {
         when (currentViewState.fragmentViewState) {
             is InitialAppEnjoymentClarifier -> {
@@ -108,13 +107,13 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     fun userSelectedPositiveFeedback() {
         viewState.value = if (canShowRatingsButton()) {
             currentViewState.copy(
-                fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
-                previousViewState = currentViewState.fragmentViewState
+                    fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
+                    previousViewState = currentViewState.fragmentViewState
             )
         } else {
             currentViewState.copy(
-                fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
-                previousViewState = currentViewState.fragmentViewState
+                    fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+                    previousViewState = currentViewState.fragmentViewState
             )
         }
     }
@@ -140,8 +139,8 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedNegativeFeedback() {
         viewState.value = currentViewState.copy(
-            fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -151,10 +150,9 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     fun userSelectedToGiveFeedback() {
-        Timber.i("User gave feedback")
         viewState.value = currentViewState.copy(
-            fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -176,6 +174,14 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
+    fun onProvidedPositiveFeedbackNoDetails() {
+        GlobalScope.launch (Dispatchers.IO) {
+            feedbackSubmitter.sendPositiveFeedback(null)
+        }
+
+        command.value = Command.Exit(feedbackSubmitted = true)
+    }
+
     fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
 
         GlobalScope.launch(Dispatchers.IO) {
@@ -188,43 +194,51 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     fun userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = subReason,
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = newState,
+                mainReason = mainReason,
+                subReason = subReason,
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: FeedbackType.SearchNotGoodEnoughSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = subReason,
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = newState,
+                mainReason = mainReason,
+                subReason = subReason,
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: FeedbackType.CustomizationSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = subReason,
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = newState,
+                mainReason = mainReason,
+                subReason = subReason,
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-            fragmentViewState = newState,
-            mainReason = mainReason,
-            subReason = subReason,
-            previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = newState,
+                mainReason = mainReason,
+                subReason = subReason,
+                previousViewState = currentViewState.fragmentViewState
         )
     }
 
+    fun userSelectedToRateApp() {
+        GlobalScope.launch(Dispatchers.IO){
+            feedbackSubmitter.sendUserRated()
+        }
+
+        command.value = Command.Exit(feedbackSubmitted = true)
+    }
+
     companion object {
         val NAVIGATION_FORWARDS = NavigationDirection(true)
         val NAVIGATION_BACKWARDS = NavigationDirection(false)
@@ -232,10 +246,10 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 }
 
 data class ViewState(
-    val fragmentViewState: FragmentState,
-    val previousViewState: FragmentState? = null,
-    val mainReason: MainReason? = null,
-    val subReason: SubReason? = null
+        val fragmentViewState: FragmentState,
+        val previousViewState: FragmentState? = null,
+        val mainReason: MainReason? = null,
+        val subReason: SubReason? = null
 )
 
 sealed class FragmentState(open val direction: NavigationDirection) {
@@ -248,14 +262,15 @@ sealed class FragmentState(open val direction: NavigationDirection) {
 
     // negative flow
     data class NegativeFeedbackMainReason(override val direction: NavigationDirection) : FragmentState(direction)
+
     data class NegativeFeedbackSubReason(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
     data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason, val subReason: SubReason? = null) :
-        FragmentState(direction)
+            FragmentState(direction)
 
     data class NegativeWebSitesBrokenFeedback(
-        override val direction: NavigationDirection,
-        val mainReason: MainReason,
-        val subReason: SubReason? = null
+            override val direction: NavigationDirection,
+            val mainReason: MainReason,
+            val subReason: SubReason? = null
     ) : FragmentState(direction)
 }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
index d4d6d5c71d0d..2e15d9ed0a4e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingFragment.kt
@@ -25,7 +25,6 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
 import com.duckduckgo.app.playstore.PlayStoreUtils
 import kotlinx.android.synthetic.main.content_feedback_positive_landing.*
-import timber.log.Timber
 import javax.inject.Inject
 
 
@@ -34,7 +33,7 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
     interface PositiveFeedbackLandingListener {
         fun userSelectedToRateApp()
         fun userSelectedToGiveFeedback()
-        fun userCancelled()
+        fun userGavePositiveFeedbackNoDetails()
     }
 
     private val viewModel by bindViewModel<PositiveFeedbackLandingViewModel>()
@@ -46,7 +45,6 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
     lateinit var playStoreUtils: PlayStoreUtils
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        Timber.i("onCreateView")
         return inflater.inflate(R.layout.content_feedback_positive_landing, container, false)
     }
 
@@ -58,7 +56,7 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
                     listener?.userSelectedToRateApp()
                 }
                 Command.Exit -> {
-                    listener?.userCancelled()
+                    listener?.userGavePositiveFeedbackNoDetails()
                 }
                 Command.LaunchShareFeedbackPage -> {
                     listener?.userSelectedToGiveFeedback()
@@ -69,8 +67,8 @@ class PositiveFeedbackLandingFragment : FeedbackFragment() {
 
     override fun configureListeners() {
         rateAppButton.setOnClickListener { viewModel.userSelectedToRateApp() }
-        shareFeedbackButton.setOnClickListener { viewModel.userSelectedToProvideFeedback() }
-        cancelButton.setOnClickListener { viewModel.userSelectedToCancel() }
+        shareFeedbackButton.setOnClickListener { viewModel.userSelectedToProvideFeedbackDetails() }
+        cancelButton.setOnClickListener { viewModel.userFinishedGivingPositiveFeedback() }
     }
 
     private fun launchPlayStore() {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
index 68bd03b678e0..5c7624447b6c 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/positive/initial/PositiveFeedbackLandingViewModel.kt
@@ -18,7 +18,6 @@ package com.duckduckgo.app.feedback.ui.positive.initial
 
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.global.SingleLiveEvent
-import timber.log.Timber
 
 
 class PositiveFeedbackLandingViewModel : ViewModel() {
@@ -26,17 +25,14 @@ class PositiveFeedbackLandingViewModel : ViewModel() {
     val command: SingleLiveEvent<Command> = SingleLiveEvent()
 
     fun userSelectedToRateApp() {
-        Timber.i("User selected to rate app")
         command.value = Command.LaunchPlayStore
     }
 
-    fun userSelectedToProvideFeedback() {
-        Timber.i("User selected to provide feedback")
+    fun userSelectedToProvideFeedbackDetails() {
         command.value = Command.LaunchShareFeedbackPage
     }
 
-    fun userSelectedToCancel() {
-        Timber.i("User is cancelling")
+    fun userFinishedGivingPositiveFeedback() {
         command.value = Command.Exit
     }
 }

From d1132b9d46ac7256377b0e37d94e35daa1a4d13e Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 21 Mar 2019 17:34:06 +0000
Subject: [PATCH 18/47] Add missing subreason for autocomplete

---
 .../app/feedback/ui/negative/FeedbackTypeDisplay.kt           | 4 ++++
 .../ui/negative/openended/ShareOpenEndedFeedbackFragment.kt   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
index 6cf413e6cd09..54f327ecde57 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -155,6 +155,10 @@ class FeedbackTypeDisplay {
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonFasterLoadTimes)
             }
 
+            BETTER_AUTOCOMPLETE.also { type ->
+                it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonBetterAutocomplete)
+            }
+
             SEARCHING_IN_SPECIFIC_LANGUAGE.also { type ->
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.searchNotGoodEnoughSubReasonSpecificLanguage)
             }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index 266247df859e..8997d6a4dd8b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -114,7 +114,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
 
     private fun updateDisplayForNegativeFeedback(args: Bundle) {
         mainReason = args.getSerializable(MAIN_REASON_EXTRA) as MainReason
-        subReason = args.getSerializable(SUB_REASON_EXTRA) as SubReason
+        subReason = args.getSerializable(SUB_REASON_EXTRA) as SubReason?
 
         title.text = getDisplayText(mainReason!!)
         subtitle.text = getDisplayText(subReason)

From 25f5f7e0582522d6f80641cad6612e938ffcb722 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 21 Mar 2019 17:41:01 +0000
Subject: [PATCH 19/47] Remove experiment inline class usage

---
 app/build.gradle                              |  3 --
 .../feedback/ui/common/FeedbackActivity.kt    | 50 +++++++++----------
 .../feedback/ui/common/FeedbackViewModel.kt   | 26 +++++-----
 3 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3120ee42fe69..a84d60b94a49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,9 +80,6 @@ android {
     androidExtensions {
         experimental = true
     }
-    kotlinOptions {
-        freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
-    }
 }
 
 ext {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 86a130b44a16..d2f42e0c4b1b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -83,57 +83,57 @@ class FeedbackActivity : DuckDuckGoActivity(),
 
         val state = viewState.fragmentViewState
         when (state) {
-            is FragmentState.InitialAppEnjoymentClarifier -> showInitialFeedbackView(state.direction)
-            is FragmentState.PositiveFeedbackStep1 -> showPositiveFeedbackView(state.direction)
-            is FragmentState.PositiveShareFeedback -> showSharePositiveFeedbackView(state.direction)
-            is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.direction)
-            is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.direction, state.mainReason)
-            is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.direction, state.mainReason, state.subReason)
-            is FragmentState.NegativeWebSitesBrokenFeedback -> showNegativeWebSiteBrokenView(state.direction)
+            is FragmentState.InitialAppEnjoymentClarifier -> showInitialFeedbackView(state.forwardDirection)
+            is FragmentState.PositiveFeedbackStep1 -> showPositiveFeedbackView(state.forwardDirection)
+            is FragmentState.PositiveShareFeedback -> showSharePositiveFeedbackView(state.forwardDirection)
+            is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.forwardDirection)
+            is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.forwardDirection, state.mainReason)
+            is FragmentState.NegativeOpenEndedFeedback -> showNegativeOpenEndedFeedbackView(state.forwardDirection, state.mainReason, state.subReason)
+            is FragmentState.NegativeWebSitesBrokenFeedback -> showNegativeWebSiteBrokenView(state.forwardDirection)
         }
     }
 
-    private fun showSharePositiveFeedbackView(direction: NavigationDirection) {
+    private fun showSharePositiveFeedbackView(forwardDirection: Boolean) {
         val fragment = ShareOpenEndedFeedbackFragment.instancePositiveFeedback()
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showNegativeFeedbackMainReasonView(direction: NavigationDirection) {
+    private fun showNegativeFeedbackMainReasonView(forwardDirection: Boolean) {
         val fragment = MainReasonNegativeFeedbackFragment.instance()
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showNegativeFeedbackSubReasonView(direction: NavigationDirection, mainReason: MainReason) {
+    private fun showNegativeFeedbackSubReasonView(forwardDirection: Boolean, mainReason: MainReason) {
         val fragment = SubReasonNegativeFeedbackFragment.instance(mainReason)
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showNegativeOpenEndedFeedbackView(direction: NavigationDirection, mainReason: MainReason, subReason: SubReason? = null) {
+    private fun showNegativeOpenEndedFeedbackView(forwardDirection: Boolean, mainReason: MainReason, subReason: SubReason? = null) {
         val fragment = ShareOpenEndedFeedbackFragment.instanceNegativeFeedback(mainReason, subReason)
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showInitialFeedbackView(direction: NavigationDirection) {
+    private fun showInitialFeedbackView(forwardDirection: Boolean) {
         val fragment = InitialFeedbackFragment.instance()
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showPositiveFeedbackView(direction: NavigationDirection) {
+    private fun showPositiveFeedbackView(forwardDirection: Boolean) {
         val fragment = PositiveFeedbackLandingFragment.instance()
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun showNegativeWebSiteBrokenView(direction: NavigationDirection) {
+    private fun showNegativeWebSiteBrokenView(forwardDirection: Boolean) {
         val fragment = BrokenSiteNegativeFeedbackFragment.instance()
-        updateFragment(fragment, direction)
+        updateFragment(fragment, forwardDirection)
     }
 
-    private fun updateFragment(fragment: FeedbackFragment, direction: NavigationDirection) {
+    private fun updateFragment(fragment: FeedbackFragment, forwardDirection: Boolean) {
         val tag = fragment.javaClass.name
         if (supportFragmentManager.findFragmentByTag(tag) != null) return
 
         supportFragmentManager.transaction {
-            this.applyTransition(direction)
+            this.applyTransition(forwardDirection)
             replace(R.id.fragmentContainer, fragment, fragment.tag)
         }
     }
@@ -243,8 +243,8 @@ private fun FeedbackActivity.animateFinish(feedbackSubmitted: Boolean) {
     overridePendingTransition(R.anim.slide_from_left, R.anim.slide_to_right)
 }
 
-private fun FragmentTransaction.applyTransition(direction: NavigationDirection) {
-    if (direction.isForward) {
+private fun FragmentTransaction.applyTransition(forwardDirection: Boolean) {
+    if (forwardDirection) {
         setCustomAnimations(R.anim.slide_from_right, R.anim.slide_to_left)
     } else {
         setCustomAnimations(R.anim.slide_from_left, R.anim.slide_to_right)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 0d2db6b178fc..f4d200fe83a6 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -240,8 +240,8 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     companion object {
-        val NAVIGATION_FORWARDS = NavigationDirection(true)
-        val NAVIGATION_BACKWARDS = NavigationDirection(false)
+        const val NAVIGATION_FORWARDS = true
+        const val NAVIGATION_BACKWARDS = false
     }
 }
 
@@ -252,30 +252,28 @@ data class ViewState(
         val subReason: SubReason? = null
 )
 
-sealed class FragmentState(open val direction: NavigationDirection) {
-    data class InitialAppEnjoymentClarifier(override val direction: NavigationDirection) : FragmentState(direction)
+sealed class FragmentState(open val forwardDirection: Boolean) {
+    data class InitialAppEnjoymentClarifier(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
     // positive flow
-    data class PositiveFeedbackStep1(override val direction: NavigationDirection) : FragmentState(direction)
+    data class PositiveFeedbackStep1(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
-    data class PositiveShareFeedback(override val direction: NavigationDirection) : FragmentState(direction)
+    data class PositiveShareFeedback(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
     // negative flow
-    data class NegativeFeedbackMainReason(override val direction: NavigationDirection) : FragmentState(direction)
+    data class NegativeFeedbackMainReason(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
-    data class NegativeFeedbackSubReason(override val direction: NavigationDirection, val mainReason: MainReason) : FragmentState(direction)
-    data class NegativeOpenEndedFeedback(override val direction: NavigationDirection, val mainReason: MainReason, val subReason: SubReason? = null) :
-            FragmentState(direction)
+    data class NegativeFeedbackSubReason(override val forwardDirection: Boolean, val mainReason: MainReason) : FragmentState(forwardDirection)
+    data class NegativeOpenEndedFeedback(override val forwardDirection: Boolean, val mainReason: MainReason, val subReason: SubReason? = null) :
+            FragmentState(forwardDirection)
 
     data class NegativeWebSitesBrokenFeedback(
-            override val direction: NavigationDirection,
+            override val forwardDirection: Boolean,
             val mainReason: MainReason,
             val subReason: SubReason? = null
-    ) : FragmentState(direction)
+    ) : FragmentState(forwardDirection)
 }
 
-inline class NavigationDirection(val isForward: Boolean)
-
 sealed class Command {
     data class Exit(val feedbackSubmitted: Boolean) : Command()
 }
\ No newline at end of file

From a855a039c7ee3f3bc882ba30d874a1c20b410818 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 13:45:23 +0000
Subject: [PATCH 20/47] Adding tests for the navigation flow

---
 .../ui/common/FeedbackViewModelTest.kt        | 294 ++++++++++++++++++
 .../feedback/ui/common/FeedbackActivity.kt    |  14 +-
 .../feedback/ui/common/FeedbackViewModel.kt   |  41 ++-
 .../ShareOpenEndedFeedbackFragment.kt         |   8 +-
 .../global/coroutine/DispatcherProvider.kt    |  41 +++
 5 files changed, 366 insertions(+), 32 deletions(-)
 create mode 100644 app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
 create mode 100644 app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
new file mode 100644
index 000000000000..d2119407a96a
--- /dev/null
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2019 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.feedback.ui.common
+
+import androidx.lifecycle.Observer
+import androidx.test.annotation.UiThreadTest
+import com.duckduckgo.app.feedback.api.FeedbackSubmitter
+import com.duckduckgo.app.feedback.ui.common.FragmentState.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
+import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.TAB_MANAGEMENT
+import com.duckduckgo.app.global.coroutine.DispatcherProvider
+import com.duckduckgo.app.playstore.PlayStoreUtils
+import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
+import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+@Suppress("RemoveExplicitTypeArguments")
+class FeedbackViewModelTest {
+
+    private lateinit var testee: FeedbackViewModel
+
+    private val playStoreUtils: PlayStoreUtils = mock()
+    private val feedbackSubmitter: FeedbackSubmitter = mock()
+
+    private val commandObserver: Observer<Command> = mock()
+    private val commandCaptor = argumentCaptor<Command>()
+
+    private val fragmentViewState
+        get() = testee.viewState.value?.fragmentViewState
+
+    @Before
+    @UiThreadTest
+    fun setup() {
+        testee = FeedbackViewModel(playStoreUtils, feedbackSubmitter, DispatcherProvider.TESTING)
+        testee.command.observeForever(commandObserver)
+    }
+
+    @After
+    @UiThreadTest
+    fun tearDown() {
+        testee.command.removeObserver(commandObserver)
+    }
+
+    @UiThreadTest
+    @Test
+    fun whenInitialisedThenFragmentStateIsForFirstStep() {
+        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenCanRateAppAndUserSelectsInitialHappyFaceThenFragmentStateIsFirstStepOfHappyFlow() {
+        configureRatingCanBeGiven()
+        testee.userSelectedPositiveFeedback()
+        assertTrue(fragmentViewState is FragmentState.PositiveFeedbackFirstStep)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenCannotRateAppAndUserSelectsInitialHappyFaceThenFragmentStateSkipsStraightToSharingFeedback() {
+        configureRatingCannotBeGiven()
+        testee.userSelectedPositiveFeedback()
+        assertTrue(fragmentViewState is FragmentState.PositiveShareFeedback)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    fun whenCanRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() = runBlocking<Unit> {
+        configureRatingCanBeGiven()
+        withContext(Dispatchers.Main) {
+            testee.userSelectedPositiveFeedback()
+            testee.onBackPressed()
+        }
+
+        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    @Test
+    fun whenCannotRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() = runBlocking<Unit> {
+        configureRatingCannotBeGiven()
+        withContext(Dispatchers.Main) {
+            testee.userSelectedPositiveFeedback()
+            testee.onBackPressed()
+        }
+
+        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+    }
+
+
+    @Test
+    fun whenUserChoosesNotToProvideFurtherDetailsForPositiveFeedbackThenSubmitted() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userGavePositiveFeedbackNoDetails()
+        }
+
+        verify(feedbackSubmitter).sendPositiveFeedback(null)
+    }
+
+    @Test
+    fun whenUserChoosesNotToProvideFurtherDetailsForPositiveFeedbackThenExitCommandIssued() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userGavePositiveFeedbackNoDetails()
+        }
+
+        val command = captureCommand() as Command.Exit
+        assertTrue(command.feedbackSubmitted)
+    }
+
+    @Test
+    fun whenUserProvidesFurtherDetailsForPositiveFeedbackThenFeedbackSubmitted() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userProvidedPositiveOpenEndedFeedback("foo")
+        }
+
+        verify(feedbackSubmitter).sendPositiveFeedback("foo")
+    }
+
+    @Test
+    fun whenUserProvidesFurtherDetailsForPositiveFeedbackThenExitCommandIssued() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userProvidedPositiveOpenEndedFeedback("foo")
+        }
+
+        val command = captureCommand() as Command.Exit
+        assertTrue(command.feedbackSubmitted)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserCancelsThenExitCommandIssued() {
+        testee.userWantsToCancel()
+        val command = captureCommand() as Command.Exit
+        assertFalse(command.feedbackSubmitted)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsInitialSadFaceThenFragmentStateIsFirstStepOfUnhappyFlow() {
+        testee.userSelectedNegativeFeedback()
+        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserNavigatesBackFromNegativeMainReasonFragmentThenFragmentStateIsInitialFragment() {
+        testee.userSelectedNegativeFeedback()
+        testee.onBackPressed()
+        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonMissingBrowserFeaturesThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonNotEnoughCustomizationsThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(NOT_ENOUGH_CUSTOMIZATIONS)
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonSearchNotGoodEnoughThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(SEARCH_NOT_GOOD_ENOUGH)
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonAppIsSlowOrBuggyThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(APP_IS_SLOW_OR_BUGGY)
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonOtherThenFragmentStateIsOpenEndedFeedback() {
+        testee.userSelectedNegativeFeedbackMainReason(OTHER)
+        assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsMainNegativeReasonBrokenSiteThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(WEBSITES_NOT_LOADING)
+        assertTrue(fragmentViewState is NegativeWebSitesBrokenFeedback)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserSelectsSubNegativeReasonThenFragmentStateIsOpenEndedFeedback() {
+        testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
+        assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
+        verifyNavigatingForwards(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserNavigatesBackFromSubReasonSelectionThenFragmentStateIsMainReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
+        testee.onBackPressed()
+        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserNavigatesBackFromOpenEndedFeedbackAndSubReasonIsValidStepThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
+        testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
+        testee.onBackPressed()
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserNavigatesBackFromOpenEndedFeedbackAndSubReasonNotAValidStepThenFragmentStateIsMainReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(OTHER)
+        testee.onBackPressed()
+        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    @Test
+    @UiThreadTest
+    fun whenUserNavigatesBackFromOpenEndedFeedbackThenFragmentStateIsSubReasonSelection() {
+        testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
+        testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
+        testee.onBackPressed()
+        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
+        verifyNavigatingBack(fragmentViewState)
+    }
+
+    private fun verifyNavigatingForwards(fragmentViewState: FragmentState?) {
+        assertTrue(fragmentViewState?.forwardDirection == true)
+    }
+
+    private fun verifyNavigatingBack(fragmentViewState: FragmentState?) {
+        assertTrue(fragmentViewState?.forwardDirection == false)
+    }
+
+    private fun captureCommand(): Command {
+        verify(commandObserver).onChanged(commandCaptor.capture())
+        return commandCaptor.lastValue
+    }
+
+    private fun configureRatingCanBeGiven() {
+        whenever(playStoreUtils.installedFromPlayStore()).thenReturn(true)
+        whenever(playStoreUtils.isPlayStoreInstalled()).thenReturn(true)
+    }
+
+    private fun configureRatingCannotBeGiven() {
+        whenever(playStoreUtils.installedFromPlayStore()).thenReturn(false)
+        whenever(playStoreUtils.isPlayStoreInstalled()).thenReturn(false)
+    }
+}
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index d2f42e0c4b1b..b20505e5d151 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -84,7 +84,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
         val state = viewState.fragmentViewState
         when (state) {
             is FragmentState.InitialAppEnjoymentClarifier -> showInitialFeedbackView(state.forwardDirection)
-            is FragmentState.PositiveFeedbackStep1 -> showPositiveFeedbackView(state.forwardDirection)
+            is FragmentState.PositiveFeedbackFirstStep -> showPositiveFeedbackView(state.forwardDirection)
             is FragmentState.PositiveShareFeedback -> showSharePositiveFeedbackView(state.forwardDirection)
             is FragmentState.NegativeFeedbackMainReason -> showNegativeFeedbackMainReasonView(state.forwardDirection)
             is FragmentState.NegativeFeedbackSubReason -> showNegativeFeedbackSubReasonView(state.forwardDirection, state.mainReason)
@@ -170,19 +170,19 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     override fun userGavePositiveFeedbackNoDetails() {
-        viewModel.onProvidedPositiveFeedbackNoDetails()
+        viewModel.userGavePositiveFeedbackNoDetails()
     }
 
-    override fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
-        viewModel.onProvidedPositiveOpenEndedFeedback(feedback)
+    override fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
+        viewModel.userProvidedPositiveOpenEndedFeedback(feedback)
     }
 
 
     /**
      * Negative feedback listeners
      */
-    override fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        viewModel.onProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback)
+    override fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback)
     }
 
     /**
@@ -198,7 +198,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      */
 
     override fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: MissingBrowserFeaturesSubReasons) {
-        viewModel.userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason, subReason)
+        viewModel.userSelectedSubReasonMissingBrowserFeatures(mainReason, subReason)
     }
 
     override fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: SearchNotGoodEnoughSubReasons) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index f4d200fe83a6..56642b2caa46 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -25,19 +25,23 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
+import com.duckduckgo.app.global.coroutine.DispatcherProvider
 import com.duckduckgo.app.playstore.PlayStoreUtils
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 
-class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val feedbackSubmitter: FeedbackSubmitter) : ViewModel() {
+class FeedbackViewModel(
+    private val playStoreUtils: PlayStoreUtils,
+    private val feedbackSubmitter: FeedbackSubmitter,
+    private val dispatcherProvider: DispatcherProvider = DispatcherProvider.PRODUCTION
+) : ViewModel() {
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
     init {
-        viewState.value = ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS))
+        viewState.postValue(ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS)))
     }
 
     private val currentViewState: ViewState
@@ -68,12 +72,12 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
             is InitialAppEnjoymentClarifier -> {
                 command.value = Command.Exit(feedbackSubmitted = false)
             }
-            is PositiveFeedbackStep1 -> {
+            is PositiveFeedbackFirstStep -> {
                 viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
             }
             is PositiveShareFeedback -> {
                 if (canShowRatingsButton()) {
-                    viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackStep1(NAVIGATION_BACKWARDS))
+                    viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_BACKWARDS))
                 } else {
                     viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
                 }
@@ -107,7 +111,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     fun userSelectedPositiveFeedback() {
         viewState.value = if (canShowRatingsButton()) {
             currentViewState.copy(
-                    fragmentViewState = PositiveFeedbackStep1(NAVIGATION_FORWARDS),
+                fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_FORWARDS),
                     previousViewState = currentViewState.fragmentViewState
             )
         } else {
@@ -156,9 +160,8 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
         )
     }
 
-    fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-
-        GlobalScope.launch(Dispatchers.IO) {
+    fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        GlobalScope.launch(dispatcherProvider.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
 
@@ -166,32 +169,30 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-
-        GlobalScope.launch(Dispatchers.IO) {
+        GlobalScope.launch(dispatcherProvider.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun onProvidedPositiveFeedbackNoDetails() {
-        GlobalScope.launch (Dispatchers.IO) {
+    fun userGavePositiveFeedbackNoDetails() {
+        GlobalScope.launch(dispatcherProvider.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun onProvidedPositiveOpenEndedFeedback(feedback: String) {
-
-        GlobalScope.launch(Dispatchers.IO) {
+    fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
+        GlobalScope.launch(dispatcherProvider.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userSelectedNegativeFeedbackMissingBrowserSubReason(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
+    fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
                 fragmentViewState = newState,
@@ -232,7 +233,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     fun userSelectedToRateApp() {
-        GlobalScope.launch(Dispatchers.IO){
+        GlobalScope.launch(dispatcherProvider.IO) {
             feedbackSubmitter.sendUserRated()
         }
 
@@ -256,13 +257,11 @@ sealed class FragmentState(open val forwardDirection: Boolean) {
     data class InitialAppEnjoymentClarifier(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
     // positive flow
-    data class PositiveFeedbackStep1(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
-
+    data class PositiveFeedbackFirstStep(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
     data class PositiveShareFeedback(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
     // negative flow
     data class NegativeFeedbackMainReason(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
-
     data class NegativeFeedbackSubReason(override val forwardDirection: Boolean, val mainReason: MainReason) : FragmentState(forwardDirection)
     data class NegativeOpenEndedFeedback(override val forwardDirection: Boolean, val mainReason: MainReason, val subReason: SubReason? = null) :
             FragmentState(forwardDirection)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index 8997d6a4dd8b..d1604642c9de 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -37,8 +37,8 @@ import timber.log.Timber
 class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
 
     interface OpenEndedFeedbackListener {
-        fun onProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String)
-        fun onProvidedPositiveOpenEndedFeedback(feedback: String)
+        fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String)
+        fun userProvidedPositiveOpenEndedFeedback(feedback: String)
         fun userCancelled()
     }
 
@@ -63,10 +63,10 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
                     listener?.userCancelled()
                 }
                 is Command.ExitAndSubmitNegativeFeedback -> {
-                    listener?.onProvidedNegativeOpenEndedFeedback(command.mainReason, command.subReason, command.feedback)
+                    listener?.userProvidedNegativeOpenEndedFeedback(command.mainReason, command.subReason, command.feedback)
                 }
                 is Command.ExitAndSubmitPositiveFeedback -> {
-                    listener?.onProvidedPositiveOpenEndedFeedback(command.feedback)
+                    listener?.userProvidedPositiveOpenEndedFeedback(command.feedback)
                 }
             }
         })
diff --git a/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt b/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt
new file mode 100644
index 000000000000..4e24d9b17092
--- /dev/null
+++ b/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2019 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.coroutine
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+
+@Suppress("PropertyName", "EXPERIMENTAL_API_USAGE")
+interface DispatcherProvider {
+
+    val IO: CoroutineDispatcher get() = Dispatchers.IO
+    val Main: CoroutineDispatcher get() = Dispatchers.Main
+    val Default: CoroutineDispatcher get() = Dispatchers.Default
+    val Unconfined: CoroutineDispatcher get() = Dispatchers.Unconfined
+
+    companion object {
+        val PRODUCTION = object : DispatcherProvider {}
+
+        val TESTING = object : DispatcherProvider {
+            override val IO get() = Dispatchers.Unconfined
+            override val Main = Dispatchers.Unconfined
+            override val Default = Dispatchers.Unconfined
+            override val Unconfined = Dispatchers.Unconfined
+        }
+    }
+}
\ No newline at end of file

From 180570942b3443f969d1cd1af7adc59614e9a50e Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 13:45:36 +0000
Subject: [PATCH 21/47] Remove ATB variant from version param

---
 .../java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index b9b631f92c15..a0277e155bd7 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -146,9 +146,7 @@ class FireAndForgetFeedbackSubmitter(
     }
 
     private fun version(): String {
-        val variantKey = variantManager.getVariant().key
-        val formattedVariantKey = if (variantKey.isBlank()) " " else " $variantKey "
-        return "${BuildConfig.VERSION_NAME}$formattedVariantKey".trim()
+        return BuildConfig.VERSION_NAME
     }
 
     private fun atbWithVariant(): String {

From 0d02230ba5b9e52e3c54703185420f23cb6bc827 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 13:54:26 +0000
Subject: [PATCH 22/47] Code tidy

---
 .../ui/common/FeedbackViewModelTest.kt        | 42 ++++++++++++++-----
 .../app/feedback/api/FeedbackSubmitter.kt     |  2 +-
 .../feedback/ui/common/FeedbackActivity.kt    |  2 -
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
index d2119407a96a..83405c75bbb0 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -89,24 +89,22 @@ class FeedbackViewModelTest {
     }
 
     @Test
-    fun whenCanRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() = runBlocking<Unit> {
+    @UiThreadTest
+    fun whenCanRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() {
         configureRatingCanBeGiven()
-        withContext(Dispatchers.Main) {
-            testee.userSelectedPositiveFeedback()
-            testee.onBackPressed()
-        }
+        testee.userSelectedPositiveFeedback()
+        testee.onBackPressed()
 
         assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
         verifyNavigatingBack(fragmentViewState)
     }
 
     @Test
-    fun whenCannotRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() = runBlocking<Unit> {
+    @UiThreadTest
+    fun whenCannotRateAppAndUserNavigatesBackFromPositiveInitialFragmentThenFragmentStateIsInitialFragment() {
         configureRatingCannotBeGiven()
-        withContext(Dispatchers.Main) {
-            testee.userSelectedPositiveFeedback()
-            testee.onBackPressed()
-        }
+        testee.userSelectedPositiveFeedback()
+        testee.onBackPressed()
 
         assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
     }
@@ -150,6 +148,30 @@ class FeedbackViewModelTest {
         assertTrue(command.feedbackSubmitted)
     }
 
+    @Test
+    fun whenUserProvidesNegativeFeedbackThenFeedbackSubmitted() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userProvidedNegativeOpenEndedFeedback(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT, "foo")
+        }
+        verify(feedbackSubmitter).sendNegativeFeedback(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT, "foo")
+    }
+
+    @Test
+    fun whenUserProvidesNegativeFeedbackNoSubReasonThenFeedbackSubmitted() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userProvidedNegativeOpenEndedFeedback(MISSING_BROWSING_FEATURES, null, "foo")
+        }
+        verify(feedbackSubmitter).sendNegativeFeedback(MISSING_BROWSING_FEATURES, null, "foo")
+    }
+
+    @Test
+    fun whenUserProvidesNegativeFeedbackEmptyOpenEndedFeedbackThenFeedbackSubmitted() = runBlocking<Unit> {
+        withContext(Dispatchers.Main) {
+            testee.userProvidedNegativeOpenEndedFeedback(MISSING_BROWSING_FEATURES, null, "")
+        }
+        verify(feedbackSubmitter).sendNegativeFeedback(MISSING_BROWSING_FEATURES, null, "")
+    }
+
     @Test
     @UiThreadTest
     fun whenUserCancelsThenExitCommandIssued() {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index a0277e155bd7..ac96ebae3f5a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -81,7 +81,7 @@ class FireAndForgetFeedbackSubmitter(
         runCatching {
             submitBrokenSiteAsync(openEnded, brokenSite).await()
         }
-                .onSuccess { Timber.i("Successfully submitted broken sœite feedback") }
+                .onSuccess { Timber.i("Successfully submitted broken site feedback") }
                 .onFailure { Timber.w(it, "Failed to send broken site feedback") }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index b20505e5d151..1fd20e99e7b4 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -154,7 +154,6 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     override fun userCancelled() {
-        Timber.i("User cancelled")
         viewModel.userWantsToCancel()
     }
 
@@ -217,7 +216,6 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback, broken site
      */
     override fun onProvidedBrokenSiteFeedback(feedback: String, url: String?) {
-        Timber.w("Received broken site feedback for site: ($url): $feedback")
         viewModel.onProvidedBrokenSiteFeedback(feedback, url)
     }
 

From b868bac182c41386f828f33d5cdfdd1f55d14b44 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 14:29:58 +0000
Subject: [PATCH 23/47] Only submit reason "broken_site" for legacy broken site
 dialog

---
 .../app/brokensite/api/BrokenSiteSender.kt    |  4 +-
 .../app/feedback/api/FeedbackService.kt       |  1 +
 .../app/feedback/api/FeedbackSubmitter.kt     | 58 ++++++++-----------
 .../res/drawable/ic_arrow_android_right.xml   | 20 -------
 app/src/main/res/values/colors.xml            |  2 -
 .../strings-feedback-disambiguation.xml       |  2 -
 app/src/main/res/values/styles.xml            |  9 ---
 7 files changed, 27 insertions(+), 69 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_arrow_android_right.xml

diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index cc268a7db5e5..5034312abe5d 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -61,8 +61,8 @@ class BrokenSiteSubmitter(
                         version = BuildConfig.VERSION_NAME,
                         atb = atbWithVariant()).await()
             }
-                    .onSuccess { Timber.v("Feedback submission succeeded") }
-                    .onFailure { Timber.w(it, "Feedback submission failed") }
+                .onSuccess { Timber.v("Feedback submission succeeded") }
+                .onFailure { Timber.w(it, "Feedback submission failed") }
         }
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
index 1d4c726e6025..6bbf5a8d2930 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
@@ -33,6 +33,7 @@ interface FeedbackService {
         @Field("category") category: String?,
         @Field("subcategory") subcategory: String?,
         @Field("comment") comment: String,
+        @Field("url") url: String? = null,
         @Field("platform") platform: String = PLATFORM,
         @Field("v") version: String,
         @Field("os") api: Int,
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index ac96ebae3f5a..585538d368c3 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -54,9 +54,9 @@ class FireAndForgetFeedbackSubmitter(
 
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
-        runCatching { submitFeedbackAsync(openEnded, NEGATIVE_FEEDBACK, category, subcategory).await() }
-                .onSuccess { Timber.i("Successfully submitted feedback") }
-                .onFailure { Timber.w(it, "Failed to send feedback") }
+        runCatching { submitFeedbackAsync(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, category = category, subcategory = subcategory).await() }
+            .onSuccess { Timber.i("Successfully submitted feedback") }
+            .onFailure { Timber.w(it, "Failed to send feedback") }
     }
 
     override suspend fun sendPositiveFeedback(openEnded: String?) {
@@ -65,9 +65,9 @@ class FireAndForgetFeedbackSubmitter(
         sendPixel(pixelForPositiveFeedback())
 
         if (!openEnded.isNullOrBlank()) {
-            runCatching { submitFeedbackAsync(openEnded, POSITIVE_FEEDBACK).await() }
-                    .onSuccess { Timber.i("Successfully submitted feedback") }
-                    .onFailure { Timber.w(it, "Failed to send feedback") }
+            runCatching { submitFeedbackAsync(openEnded = openEnded, rating = POSITIVE_FEEDBACK).await() }
+                .onSuccess { Timber.i("Successfully submitted feedback") }
+                .onFailure { Timber.w(it, "Failed to send feedback") }
         }
     }
 
@@ -79,10 +79,10 @@ class FireAndForgetFeedbackSubmitter(
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
         runCatching {
-            submitBrokenSiteAsync(openEnded, brokenSite).await()
+            submitFeedbackAsync(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, url = brokenSite).await()
         }
-                .onSuccess { Timber.i("Successfully submitted broken site feedback") }
-                .onFailure { Timber.w(it, "Failed to send broken site feedback") }
+            .onSuccess { Timber.i("Successfully submitted broken site feedback") }
+            .onFailure { Timber.w(it, "Failed to send broken site feedback") }
     }
 
     override suspend fun sendUserRated() {
@@ -96,33 +96,23 @@ class FireAndForgetFeedbackSubmitter(
     }
 
     private fun submitFeedbackAsync(
-            openEnded: String,
-            rating: String,
-            category: String? = null,
-            subcategory: String? = null
+        openEnded: String,
+        rating: String,
+        category: String? = null,
+        subcategory: String? = null,
+        url: String? = null
     ): Deferred<Response<Void>> {
         return feedbackService.submitFeedbackAsync(
-                category = category,
-                subcategory = subcategory,
-                rating = rating,
-                comment = openEnded,
-                version = version(),
-                manufacturer = Build.MANUFACTURER,
-                model = Build.MODEL,
-                api = Build.VERSION.SDK_INT,
-                atb = atbWithVariant()
-        )
-    }
-
-    private fun submitBrokenSiteAsync(openEnded: String, url: String?): Deferred<Response<Void>> {
-        return feedbackService.submitBrokenSiteAsync(
-                comment = openEnded,
-                url = url,
-                version = version(),
-                manufacturer = Build.MANUFACTURER,
-                model = Build.MODEL,
-                api = Build.VERSION.SDK_INT,
-                atb = atbWithVariant()
+            category = category,
+            subcategory = subcategory,
+            rating = rating,
+            url = url,
+            comment = openEnded,
+            version = version(),
+            manufacturer = Build.MANUFACTURER,
+            model = Build.MODEL,
+            api = Build.VERSION.SDK_INT,
+            atb = atbWithVariant()
         )
     }
 
diff --git a/app/src/main/res/drawable/ic_arrow_android_right.xml b/app/src/main/res/drawable/ic_arrow_android_right.xml
deleted file mode 100644
index 30ea63d1ef77..000000000000
--- a/app/src/main/res/drawable/ic_arrow_android_right.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (c) 2019 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.
-  -->
-
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#DE5833" android:fillType="evenOdd" android:pathData="M11.243,8H3.5a0.5,0.5 0,0 1,0 -1h7.793l-2.94,-2.94a0.5,0.5 0,1 1,0.708 -0.706l3.535,3.535c0.046,0.045 0.404,0.372 0.404,0.611 0,0.24 -0.376,0.533 -0.404,0.56l-3.535,3.536a0.5,0.5 0,0 1,-0.707 -0.707L11.243,8z"/>
-</vector>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 244d863bcf15..e3f29e9fa59d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -60,7 +60,6 @@
     <color name="subtleGrayTwo">#d8d8d8</color>
     <color name="whiteSix">#e5e5e5</color>
     <color name="pinkish_grey_two">#c0c0c0</color>
-    <color name="veryLightGray">#eaeaea</color>
 
     <color name="orange">#de5833</color>
     <color name="brickOrange">#d03a10</color>
@@ -83,6 +82,5 @@
     <color name="portGore">#2f1f51</color>
 
     <color name="translucentDark">#b000</color>
-    <color name="nearlyBlack">#343434</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index 3699fe0cb145..6f696cbf51aa 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -66,8 +66,6 @@
 
     <string name="openEndedInputHint">How can we improve? (Optional)</string>
     <string name="submitFeedback">SUBMIT FEEDBACK</string>
-    <string name="appreciateYourFeedback">We appreciate your feedback</string>
-    <string name="anonymousFeedbackIsImportant">Your anonymous feedback is important to us</string>
 
     <string name="tellUsHowToImprove">Please tell us what we can improve.</string>
     <string name="thanksForTheFeedback">Thanks for the feedback!</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f101929b85ec..bf9f6ba67772 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -237,9 +237,6 @@
         <item name="android:textColor">@color/cornflowerBlue</item>
     </style>
 
-
-    <style name="Theme.Bridge" parent="Theme.MaterialComponents.Light.Bridge" />
-
     <style name="FeedbackFragmentStyle" >
         <item name="android:background">?attr/colorPrimaryDark</item>
         <item name="android:layout_width">match_parent</item>
@@ -306,10 +303,4 @@
         <item name="android:layout_marginTop">9dp</item>
     </style>
 
-    <style name="FeedbackListSeparator">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@drawable/feedback_list_divider</item>
-    </style>
-
 </resources>
\ No newline at end of file

From d65e996771f385232bafbe9d095d439e89b1c641 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:04:52 +0000
Subject: [PATCH 24/47] Add adjustResize param to allow submit button to appear
 above keyboard

---
 app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50b506a5d6a4..1ca0a7af2d1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,6 +109,7 @@
             android:parentActivityName=".BrowserActivity" />
         <activity
             android:name="com.duckduckgo.app.feedback.ui.common.FeedbackActivity"
+            android:windowSoftInputMode="adjustResize"
             android:label="@string/brokenSiteActivityTitle" />
         <activity
             android:name="com.duckduckgo.app.brokensite.BrokenSiteActivity"

From 2a36a96761d838dee5a42425cefb27a68a662779 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:13:17 +0000
Subject: [PATCH 25/47] Fix case of string

---
 app/src/main/res/values/strings-feedback-disambiguation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index 6f696cbf51aa..80b8e4242e78 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -28,7 +28,7 @@
     <string name="missingBrowserFeatureSubReasonOther">None of these</string>
 
     <string name="websiteNotLoadingTitleLong">Certainly websites don\'t load correctly</string>
-    <string name="websiteNotLoadingTitleShort">Website Loading Issues</string>
+    <string name="websiteNotLoadingTitleShort">Website loading Issues</string>
     <string name="websiteNotLoadingSubtitle">Which website is broken?"</string>
 
     <string name="searchNotGoodEnoughTitleLong">DuckDuckGo search isn\'t good enough</string>

From 950f3907689038d2520a5b46f025e42c7dbc84f9 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:34:51 +0000
Subject: [PATCH 26/47] Cody tidy

---
 app/build.gradle                              |  6 ----
 .../app/brokensite/api/BrokenSiteSender.kt    | 17 ++++-----
 .../app/browser/BrowserTabViewModel.kt        | 19 ++++------
 .../com/duckduckgo/app/di/NetworkModule.kt    | 36 +++++++++----------
 4 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a84d60b94a49..5a007271ab5c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,8 +5,6 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
-apply plugin: 'org.jetbrains.kotlin.android.extensions'
-
 ext {
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
@@ -76,10 +74,6 @@ android {
         println "Signing properties not found at ${propertiesPath}, releases will NOT succeed"
         android.buildTypes.release.signingConfig = null
     }
-
-    androidExtensions {
-        experimental = true
-    }
 }
 
 ext {
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index 5034312abe5d..e97c31f0ef09 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -52,14 +52,15 @@ class BrokenSiteSubmitter(
 
             runCatching {
                 service.submitBrokenSiteAsync(
-                        reason = reason,
-                        url = url,
-                        comment = comment,
-                        api = Build.VERSION.SDK_INT,
-                        manufacturer = Build.MANUFACTURER,
-                        model = Build.MODEL,
-                        version = BuildConfig.VERSION_NAME,
-                        atb = atbWithVariant()).await()
+                    reason = reason,
+                    url = url,
+                    comment = comment,
+                    api = Build.VERSION.SDK_INT,
+                    manufacturer = Build.MANUFACTURER,
+                    model = Build.MODEL,
+                    version = BuildConfig.VERSION_NAME,
+                    atb = atbWithVariant()
+                ).await()
             }
                 .onSuccess { Timber.v("Feedback submission succeeded") }
                 .onFailure { Timber.w(it, "Feedback submission failed") }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
index a79e6c0b491e..39f8d4cd17c0 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -54,7 +54,6 @@ import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.db.AppConfigurationEntity
 import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.app.global.model.SiteFactory
-import com.duckduckgo.app.global.performance.measureExecution
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardEntry
 import com.duckduckgo.app.privacy.db.SiteVisitedEntity
@@ -428,12 +427,10 @@ class BrowserTabViewModel(
     }
 
     private fun updateNetworkLeaderboard(event: TrackingEvent) {
-        measureExecution("updated network leaderboard") {
-            val networkName = event.trackerNetwork?.name ?: return
-            val domainVisited = Uri.parse(event.documentUrl).host ?: return
-            networkLeaderboardDao.insert(NetworkLeaderboardEntry(networkName, domainVisited))
-            networkLeaderboardDao.insert(SiteVisitedEntity(domainVisited))
-        }
+        val networkName = event.trackerNetwork?.name ?: return
+        val domainVisited = Uri.parse(event.documentUrl).host ?: return
+        networkLeaderboardDao.insert(NetworkLeaderboardEntry(networkName, domainVisited))
+        networkLeaderboardDao.insert(SiteVisitedEntity(domainVisited))
     }
 
     override fun pageHasHttpResources(page: String?) {
@@ -444,11 +441,9 @@ class BrowserTabViewModel(
     }
 
     private fun onSiteChanged() {
-        measureExecution("on site changed") {
-            siteLiveData.postValue(site)
-            privacyGrade.postValue(site?.improvedGrade)
-            tabRepository.update(tabId, site)
-        }
+        siteLiveData.postValue(site)
+        privacyGrade.postValue(site?.improvedGrade)
+        tabRepository.update(tabId, site)
     }
 
     override fun showFileChooser(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
diff --git a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
index 51673cbc11c4..a68501c3eab1 100644
--- a/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/NetworkModule.kt
@@ -60,9 +60,9 @@ class NetworkModule {
     fun apiOkHttpClient(context: Context, apiRequestInterceptor: ApiRequestInterceptor): OkHttpClient {
         val cache = Cache(context.cacheDir, CACHE_SIZE)
         return OkHttpClient.Builder()
-                .addInterceptor(apiRequestInterceptor)
-                .cache(cache)
-                .build()
+            .addInterceptor(apiRequestInterceptor)
+            .cache(cache)
+            .build()
     }
 
     @Provides
@@ -70,8 +70,8 @@ class NetworkModule {
     @Named("pixel")
     fun pixelOkHttpClient(apiRequestInterceptor: ApiRequestInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
-                .addInterceptor(apiRequestInterceptor)
-                .build()
+            .addInterceptor(apiRequestInterceptor)
+            .build()
     }
 
     @Provides
@@ -79,12 +79,12 @@ class NetworkModule {
     @Named("api")
     fun apiRetrofit(@Named("api") okHttpClient: OkHttpClient, moshi: Moshi): Retrofit {
         return Retrofit.Builder()
-                .baseUrl(Url.API)
-                .client(okHttpClient)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .addCallAdapterFactory(CoroutineCallAdapterFactory())
-                .addConverterFactory(MoshiConverterFactory.create(moshi))
-                .build()
+            .baseUrl(Url.API)
+            .client(okHttpClient)
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+            .addCallAdapterFactory(CoroutineCallAdapterFactory())
+            .addConverterFactory(MoshiConverterFactory.create(moshi))
+            .build()
     }
 
     @Provides
@@ -92,10 +92,10 @@ class NetworkModule {
     @Named("pixel")
     fun pixelRetrofit(@Named("pixel") okHttpClient: OkHttpClient): Retrofit {
         return Retrofit.Builder()
-                .baseUrl(Url.PIXEL)
-                .client(okHttpClient)
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .build()
+            .baseUrl(Url.PIXEL)
+            .client(okHttpClient)
+            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+            .build()
     }
 
     @Provides
@@ -143,9 +143,9 @@ class NetworkModule {
     @Provides
     @Singleton
     fun appConfigurationSyncer(
-            jobBuilder: JobBuilder,
-            jobScheduler: JobScheduler,
-            appConfigurationDownloader: ConfigurationDownloader
+        jobBuilder: JobBuilder,
+        jobScheduler: JobScheduler,
+        appConfigurationDownloader: ConfigurationDownloader
     ): AppConfigurationSyncer {
         return AppConfigurationSyncer(jobBuilder, jobScheduler, appConfigurationDownloader)
     }

From bc1548e0651beb5c8b08811889113252937e3abf Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:38:22 +0000
Subject: [PATCH 27/47] Code tidy

---
 .../app/feedback/ui/common/FeedbackFragment.kt      |  1 -
 .../app/feedback/ui/negative/FeedbackTypeDisplay.kt |  2 --
 .../openended/ShareOpenEndedFeedbackFragment.kt     |  1 -
 .../ShareOpenEndedNegativeFeedbackViewModel.kt      |  1 -
 .../com/duckduckgo/app/global/model/SiteMonitor.kt  | 13 +++++--------
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
index 3f92e34b9383..704179ceb7dd 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
@@ -36,7 +36,6 @@ abstract class FeedbackFragment : Fragment() {
         super.onAttach(context)
     }
 
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         configureListeners()
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
index 54f327ecde57..de39e48073ac 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -183,12 +183,10 @@ class FeedbackTypeDisplay {
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonWhichDataIsCleared)
             }
 
-
             WHEN_DATA_IS_CLEARED.also { type ->
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonWhenDataIsCleared)
             }
 
-
             BOOKMARK_DISPLAY.also { type ->
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.needMoreCustomizationSubReasonBookmarksDisplay)
             }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index d1604642c9de..2b100f56e59e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -167,7 +167,6 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
             val fragment = ShareOpenEndedFeedbackFragment()
             fragment.arguments = Bundle().also {
                 it.putBoolean(IS_POSITIVE_FEEDBACK_EXTRA, false)
-
                 it.putSerializable(MAIN_REASON_EXTRA, mainReason)
 
                 if (subReason != null) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
index b594bbe82ec5..797cb240642d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedNegativeFeedbackViewModel.kt
@@ -34,7 +34,6 @@ class ShareOpenEndedNegativeFeedbackViewModel : ViewModel() {
         command.value = Command.ExitAndSubmitNegativeFeedback(mainReason, subReason, openEndedComment)
     }
 
-
     sealed class Command {
         data class ExitAndSubmitNegativeFeedback(val mainReason: MainReason, val subReason: SubReason?, val feedback: String) : Command()
         data class ExitAndSubmitPositiveFeedback(val feedback: String) : Command()
diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
index 69da991a895d..6fa0fc3a449a 100644
--- a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
@@ -68,14 +68,11 @@ class SiteMonitor(
             val networks = measureExecution("got tracker networks") {
                 HashMap<String, MutableList<TrackingEvent>>().toMutableMap()
             }
-
-            measureExecution("totalled events") {
-                for (event: TrackingEvent in trackingEvents.distinctBy { Uri.parse(it.trackerUrl).baseHost }) {
-                    val network = event.trackerNetwork?.name ?: Uri.parse(event.trackerUrl).baseHost ?: event.trackerUrl
-                    val events = networks[network] ?: ArrayList()
-                    events.add(event)
-                    networks[network] = events
-                }
+            for (event: TrackingEvent in trackingEvents.distinctBy { Uri.parse(it.trackerUrl).baseHost }) {
+                val network = event.trackerNetwork?.name ?: Uri.parse(event.trackerUrl).baseHost ?: event.trackerUrl
+                val events = networks[network] ?: ArrayList()
+                events.add(event)
+                networks[network] = events
             }
             return networks
         }

From 5821d19fd7bab6a2d5665c3389e8c5c7bdefe6a2 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:39:28 +0000
Subject: [PATCH 28/47] code tidy

---
 .../app/global/model/SiteMonitor.kt           | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
index 6fa0fc3a449a..44f32211bbbc 100644
--- a/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/model/SiteMonitor.kt
@@ -19,7 +19,6 @@ package com.duckduckgo.app.global.model
 import android.net.Uri
 import com.duckduckgo.app.global.baseHost
 import com.duckduckgo.app.global.isHttps
-import com.duckduckgo.app.global.performance.measureExecution
 import com.duckduckgo.app.privacy.model.Grade
 import com.duckduckgo.app.privacy.model.HttpsStatus
 import com.duckduckgo.app.privacy.model.PrivacyGrade
@@ -65,9 +64,7 @@ class SiteMonitor(
 
     override val distinctTrackersByNetwork: Map<String, List<TrackingEvent>>
         get() {
-            val networks = measureExecution("got tracker networks") {
-                HashMap<String, MutableList<TrackingEvent>>().toMutableMap()
-            }
+            val networks = HashMap<String, MutableList<TrackingEvent>>().toMutableMap()
             for (event: TrackingEvent in trackingEvents.distinctBy { Uri.parse(it.trackerUrl).baseHost }) {
                 val network = event.trackerNetwork?.name ?: Uri.parse(event.trackerUrl).baseHost ?: event.trackerUrl
                 val events = networks[network] ?: ArrayList()
@@ -95,16 +92,14 @@ class SiteMonitor(
     }
 
     override fun trackerDetected(event: TrackingEvent) {
-        measureExecution("registered a tracker was detected") {
-            trackingEvents.add(event)
-
-            val entity = event.entity
-            val prevalence = prevalenceStore.findPrevalenceOf(entity)
-            if (event.blocked) {
-                gradeCalculator.addEntityBlocked(entity, prevalence)
-            } else {
-                gradeCalculator.addEntityNotBlocked(entity, prevalence)
-            }
+        trackingEvents.add(event)
+
+        val entity = event.entity
+        val prevalence = prevalenceStore.findPrevalenceOf(entity)
+        if (event.blocked) {
+            gradeCalculator.addEntityBlocked(entity, prevalence)
+        } else {
+            gradeCalculator.addEntityNotBlocked(entity, prevalence)
         }
     }
 

From e6842b39b37bd03877cc9f6f0595281f6e095ddb Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 10:32:15 +0000
Subject: [PATCH 29/47] Remove dispatcher provider attempt (hard to reason
 about)

---
 .../ui/common/FeedbackViewModelTest.kt        |  3 +-
 .../feedback/ui/common/FeedbackActivity.kt    | 17 +++++---
 .../feedback/ui/common/FeedbackViewModel.kt   | 27 ++++++------
 .../global/coroutine/DispatcherProvider.kt    | 41 -------------------
 4 files changed, 25 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
index 83405c75bbb0..57a82da74368 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -22,7 +22,6 @@ import com.duckduckgo.app.feedback.api.FeedbackSubmitter
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MissingBrowserFeaturesSubReasons.TAB_MANAGEMENT
-import com.duckduckgo.app.global.coroutine.DispatcherProvider
 import com.duckduckgo.app.playstore.PlayStoreUtils
 import com.nhaarman.mockitokotlin2.argumentCaptor
 import com.nhaarman.mockitokotlin2.mock
@@ -54,7 +53,7 @@ class FeedbackViewModelTest {
     @Before
     @UiThreadTest
     fun setup() {
-        testee = FeedbackViewModel(playStoreUtils, feedbackSubmitter, DispatcherProvider.TESTING)
+        testee = FeedbackViewModel(playStoreUtils, feedbackSubmitter)
         testee.command.observeForever(commandObserver)
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index 1fd20e99e7b4..d0b918bae385 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -34,7 +34,11 @@ import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedba
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import kotlinx.android.synthetic.main.include_toolbar.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import timber.log.Timber
+import kotlin.coroutines.CoroutineContext
 
 
 class FeedbackActivity : DuckDuckGoActivity(),
@@ -43,7 +47,10 @@ class FeedbackActivity : DuckDuckGoActivity(),
     ShareOpenEndedFeedbackFragment.OpenEndedFeedbackListener,
     MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
     BrokenSiteNegativeFeedbackFragment.BrokenSiteFeedbackListener,
-    SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
+    SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener, CoroutineScope {
+
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main
 
     private val viewModel: FeedbackViewModel by bindViewModel()
 
@@ -169,11 +176,11 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     override fun userGavePositiveFeedbackNoDetails() {
-        viewModel.userGavePositiveFeedbackNoDetails()
+        launch { viewModel.userGavePositiveFeedbackNoDetails() }
     }
 
     override fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        viewModel.userProvidedPositiveOpenEndedFeedback(feedback)
+        launch { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
     }
 
 
@@ -181,7 +188,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback listeners
      */
     override fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback)
+        launch { viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback) }
     }
 
     /**
@@ -216,7 +223,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback, broken site
      */
     override fun onProvidedBrokenSiteFeedback(feedback: String, url: String?) {
-        viewModel.onProvidedBrokenSiteFeedback(feedback, url)
+        launch { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 56642b2caa46..4e6bf4c2f283 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -25,18 +25,15 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SubReason
 import com.duckduckgo.app.global.SingleLiveEvent
-import com.duckduckgo.app.global.coroutine.DispatcherProvider
 import com.duckduckgo.app.playstore.PlayStoreUtils
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 
-class FeedbackViewModel(
-    private val playStoreUtils: PlayStoreUtils,
-    private val feedbackSubmitter: FeedbackSubmitter,
-    private val dispatcherProvider: DispatcherProvider = DispatcherProvider.PRODUCTION
-) : ViewModel() {
+class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val feedbackSubmitter: FeedbackSubmitter) : ViewModel() {
 
     val viewState: MutableLiveData<ViewState> = MutableLiveData()
 
@@ -160,32 +157,32 @@ class FeedbackViewModel(
         )
     }
 
-    fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        GlobalScope.launch(dispatcherProvider.IO) {
+    suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-        GlobalScope.launch(dispatcherProvider.IO) {
+    suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
+        withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userGavePositiveFeedbackNoDetails() {
-        GlobalScope.launch(dispatcherProvider.IO) {
+    suspend fun userGavePositiveFeedbackNoDetails() {
+        withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
 
         command.value = Command.Exit(feedbackSubmitted = true)
     }
 
-    fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        GlobalScope.launch(dispatcherProvider.IO) {
+    suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
+        withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
 
@@ -233,7 +230,7 @@ class FeedbackViewModel(
     }
 
     fun userSelectedToRateApp() {
-        GlobalScope.launch(dispatcherProvider.IO) {
+        GlobalScope.launch(Dispatchers.IO) {
             feedbackSubmitter.sendUserRated()
         }
 
diff --git a/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt b/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt
deleted file mode 100644
index 4e24d9b17092..000000000000
--- a/app/src/main/java/com/duckduckgo/app/global/coroutine/DispatcherProvider.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2019 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.coroutine
-
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
-
-
-@Suppress("PropertyName", "EXPERIMENTAL_API_USAGE")
-interface DispatcherProvider {
-
-    val IO: CoroutineDispatcher get() = Dispatchers.IO
-    val Main: CoroutineDispatcher get() = Dispatchers.Main
-    val Default: CoroutineDispatcher get() = Dispatchers.Default
-    val Unconfined: CoroutineDispatcher get() = Dispatchers.Unconfined
-
-    companion object {
-        val PRODUCTION = object : DispatcherProvider {}
-
-        val TESTING = object : DispatcherProvider {
-            override val IO get() = Dispatchers.Unconfined
-            override val Main = Dispatchers.Unconfined
-            override val Default = Dispatchers.Unconfined
-            override val Unconfined = Dispatchers.Unconfined
-        }
-    }
-}
\ No newline at end of file

From 524cda2336fa04b627475ce84acade7b08afe51d Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:06:32 +0000
Subject: [PATCH 30/47] Upgrade to latest stable WorkManager

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5a007271ab5c..11703e9d614f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -85,8 +85,8 @@ ext {
     fragmentKtx = "1.0.0"
     constraintLayout = "2.0.0-alpha3"
     lifecycle = "2.0.0"
-    room = "2.1.0-alpha04"
-    workManager = "1.0.0-rc01"
+    room = "2.1.0-alpha05"
+    workManager = "2.0.0"
     legacySupport = "1.0.0"
     espressoCore = "3.1.1"
     coreTesting = "2.0.0"
@@ -158,7 +158,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room"
 
     // WorkManager
-    implementation "android.arch.work:work-runtime-ktx:$workManager"
+    implementation "androidx.work:work-runtime-ktx:$workManager"
 
     // Dagger
     kapt "com.google.dagger:dagger-android-processor:$dagger"

From 00e08064af15bd90dd1d2beef5b7a8aa701e2272 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:26:39 +0000
Subject: [PATCH 31/47] Remove empty string check to make inline with iOS

---
 .../java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index 585538d368c3..d9116c0225ba 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -64,7 +64,7 @@ class FireAndForgetFeedbackSubmitter(
 
         sendPixel(pixelForPositiveFeedback())
 
-        if (!openEnded.isNullOrBlank()) {
+        if (openEnded != null) {
             runCatching { submitFeedbackAsync(openEnded = openEnded, rating = POSITIVE_FEEDBACK).await() }
                 .onSuccess { Timber.i("Successfully submitted feedback") }
                 .onFailure { Timber.w(it, "Failed to send feedback") }

From 23d417fdd329b5bb94e80b15f82887f019247c6b Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:37:09 +0000
Subject: [PATCH 32/47] Code tidy

---
 .../app/feedback/ui/common/FeedbackFragment.kt       |  2 +-
 .../app/feedback/ui/common/FeedbackViewModel.kt      | 12 ++++--------
 .../app/feedback/ui/negative/FeedbackTypeDisplay.kt  |  2 --
 .../mainreason/MainReasonNegativeFeedbackFragment.kt |  7 -------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
index 704179ceb7dd..d61fb719142a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackFragment.kt
@@ -42,7 +42,7 @@ abstract class FeedbackFragment : Fragment() {
         configureViewModelObservers()
     }
 
-    abstract fun configureViewModelObservers()
+    open fun configureViewModelObservers() {}
     open fun configureListeners() {}
 
     protected inline fun <reified V : ViewModel> bindViewModel() = lazy { ViewModelProviders.of(this, viewModelFactory).get(V::class.java) }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 4e6bf4c2f283..85e6e020a5d4 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -158,35 +158,31 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
+        command.value = Command.Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
-
-        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
+        command.value = Command.Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
-
-        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     suspend fun userGavePositiveFeedbackNoDetails() {
+        command.value = Command.Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
-
-        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
+        command.value = Command.Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
-
-        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
index de39e48073ac..35add9c869b4 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -110,7 +110,6 @@ class FeedbackTypeDisplay {
                     R.string.otherMainReasonSubtitle
                 )
             }
-
         }
 
         val subReasons: Map<SubReason, FeedbackTypeSubReasonDisplay> = mutableMapOf<SubReason, FeedbackTypeSubReasonDisplay>().also {
@@ -211,6 +210,5 @@ class FeedbackTypeDisplay {
                 it[type] = FeedbackTypeSubReasonDisplay(type, R.string.appIsSlowOrBuggySubReasonOther, R.string.tellUsHowToImprove)
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
index 61b768f0a52a..6c3859815369 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonNegativeFeedbackFragment.kt
@@ -30,7 +30,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay
 import kotlinx.android.synthetic.main.content_feedback_negative_disambiguation_main_reason.*
-import timber.log.Timber
 
 
 class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
@@ -48,7 +47,6 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
 
         recyclerAdapter = MainReasonAdapter(object : (FeedbackTypeMainReasonDisplay) -> Unit {
             override fun invoke(reason: FeedbackTypeMainReasonDisplay) {
-                Timber.i("Clicked reason: $reason")
                 listener?.userSelectedNegativeFeedbackMainReason(reason.mainReason)
             }
         })
@@ -65,7 +63,6 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
             recyclerView.addItemDecoration(FeedbackItemDecoration(ContextCompat.getDrawable(it, R.drawable.feedback_list_divider)!!))
 
             val listValues = getMainReasonsDisplayText()
-            Timber.i("There are ${listValues.size} subReasons to show")
             recyclerAdapter.submitList(listValues)
         }
     }
@@ -77,10 +74,6 @@ class MainReasonNegativeFeedbackFragment : FeedbackFragment() {
         }
     }
 
-    override fun configureViewModelObservers() {
-
-    }
-
     companion object {
 
         fun instance(): MainReasonNegativeFeedbackFragment {

From 87b77a8bb4e684037e07774d45a89d022e69dc3c Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:40:36 +0000
Subject: [PATCH 33/47] Code tidy

---
 .../ShareOpenEndedFeedbackFragment.kt          | 18 ------------------
 .../SubReasonNegativeFeedbackFragment.kt       |  1 -
 2 files changed, 19 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index 2b100f56e59e..255d8593a625 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -31,7 +31,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.mai
 import com.duckduckgo.app.feedback.ui.negative.FeedbackTypeDisplay.Companion.subReasons
 import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedNegativeFeedbackViewModel.Command
 import kotlinx.android.synthetic.main.content_feedback_open_ended_feedback.*
-import timber.log.Timber
 
 
 class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
@@ -78,7 +77,6 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
         if (arguments == null) throw IllegalArgumentException("Missing required arguments")
 
         arguments?.let { args ->
-
             isPositiveFeedback = args.getBoolean(IS_POSITIVE_FEEDBACK_EXTRA)
 
             if (isPositiveFeedback) {
@@ -89,22 +87,6 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        val inputState = openEndedFeedback.text.toString()
-        Timber.i("Saving view state - {$inputState}")
-        super.onSaveInstanceState(outState)
-        outState.putString("input", inputState)
-    }
-
-    override fun onViewStateRestored(savedInstanceState: Bundle?) {
-        Timber.i("restoring view state $savedInstanceState")
-
-        savedInstanceState?.getString("input")?.let {
-            openEndedFeedback.setText(it)
-        }
-        super.onViewStateRestored(savedInstanceState)
-    }
-
     private fun updateDisplayForPositiveFeedback() {
         title.text = getString(R.string.feedbackShareDetails)
         subtitle.text = getString(R.string.sharePositiveFeedbackWithTheTeam)
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
index 6bf67616b494..3635d5cfd3d5 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
@@ -56,7 +56,6 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
 
         recyclerAdapter = SubReasonAdapter(object : (FeedbackTypeSubReasonDisplay) -> Unit {
             override fun invoke(reason: FeedbackTypeSubReasonDisplay) {
-                Timber.i("Clicked reason: $reason")
                 when (reason.subReason) {
                     is MissingBrowserFeaturesSubReasons -> {
                         listener?.userSelectedSubReasonMissingBrowserFeatures(mainReason, reason.subReason)

From 9faa6899f23190b221a84c9ea72cd762b994bf2d Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 13:13:27 +0000
Subject: [PATCH 34/47] Fix memory leak

---
 .../app/brokensite/api/BrokenSiteSender.kt    |  4 +-
 .../app/feedback/api/FeedbackService.kt       | 11 +++---
 .../app/feedback/api/FeedbackSubmitter.kt     | 38 +++++++++++--------
 .../feedback/ui/common/FeedbackActivity.kt    | 19 ++++------
 .../feedback/ui/common/FeedbackViewModel.kt   | 13 +++----
 5 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index e97c31f0ef09..2002cb5ba112 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -51,7 +51,7 @@ class BrokenSiteSubmitter(
         GlobalScope.launch(Dispatchers.IO) {
 
             runCatching {
-                service.submitBrokenSiteAsync(
+                service.submitBrokenSite(
                     reason = reason,
                     url = url,
                     comment = comment,
@@ -60,7 +60,7 @@ class BrokenSiteSubmitter(
                     model = Build.MODEL,
                     version = BuildConfig.VERSION_NAME,
                     atb = atbWithVariant()
-                ).await()
+                ).execute()
             }
                 .onSuccess { Timber.v("Feedback submission succeeded") }
                 .onFailure { Timber.w(it, "Feedback submission failed") }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
index 6bbf5a8d2930..05ff805be60d 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackService.kt
@@ -16,8 +16,7 @@
 
 package com.duckduckgo.app.feedback.api
 
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
+import retrofit2.Call
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.POST
@@ -27,7 +26,7 @@ interface FeedbackService {
 
     @FormUrlEncoded
     @POST("/feedback.js?type=app-feedback")
-    fun submitFeedbackAsync(
+    fun submitFeedback(
         @Field("reason") reason: String = REASON_GENERAL,
         @Field("rating") rating: String,
         @Field("category") category: String?,
@@ -40,11 +39,11 @@ interface FeedbackService {
         @Field("manufacturer") manufacturer: String,
         @Field("model") model: String,
         @Field("atb") atb: String
-    ): Deferred<Response<Void>>
+    ): Call<Void>
 
     @FormUrlEncoded
     @POST("/feedback.js?type=app-feedback")
-    fun submitBrokenSiteAsync(
+    fun submitBrokenSite(
         @Field("reason") reason: String = REASON_BROKEN_SITE,
         @Field("comment") comment: String,
         @Field("platform") platform: String = PLATFORM,
@@ -54,7 +53,7 @@ interface FeedbackService {
         @Field("manufacturer") manufacturer: String,
         @Field("model") model: String,
         @Field("atb") atb: String
-    ): Deferred<Response<Void>>
+    ): Call<Void>
 
     companion object {
         const val REASON_GENERAL = "general"
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index d9116c0225ba..269f9ef49d34 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -25,8 +25,8 @@ import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.FEEDBACK_NEGATIVE_SUBMISSION
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
-import kotlinx.coroutines.Deferred
-import retrofit2.Response
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.util.*
 
@@ -54,9 +54,11 @@ class FireAndForgetFeedbackSubmitter(
 
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
-        runCatching { submitFeedbackAsync(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, category = category, subcategory = subcategory).await() }
-            .onSuccess { Timber.i("Successfully submitted feedback") }
-            .onFailure { Timber.w(it, "Failed to send feedback") }
+        GlobalScope.launch {
+            runCatching { submitFeedback(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, category = category, subcategory = subcategory) }
+                .onSuccess { Timber.i("Successfully submitted feedback") }
+                .onFailure { Timber.w(it, "Failed to send feedback") }
+        }
     }
 
     override suspend fun sendPositiveFeedback(openEnded: String?) {
@@ -65,9 +67,11 @@ class FireAndForgetFeedbackSubmitter(
         sendPixel(pixelForPositiveFeedback())
 
         if (openEnded != null) {
-            runCatching { submitFeedbackAsync(openEnded = openEnded, rating = POSITIVE_FEEDBACK).await() }
-                .onSuccess { Timber.i("Successfully submitted feedback") }
-                .onFailure { Timber.w(it, "Failed to send feedback") }
+            GlobalScope.launch {
+                runCatching { submitFeedback(openEnded = openEnded, rating = POSITIVE_FEEDBACK) }
+                    .onSuccess { Timber.i("Successfully submitted feedback") }
+                    .onFailure { Timber.w(it, "Failed to send feedback") }
+            }
         }
     }
 
@@ -78,11 +82,13 @@ class FireAndForgetFeedbackSubmitter(
         val subcategory = apiKeyMapper.apiKeyFromSubReason(null)
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
-        runCatching {
-            submitFeedbackAsync(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, url = brokenSite).await()
+        GlobalScope.launch {
+            runCatching {
+                submitFeedback(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, url = brokenSite, category = category)
+            }
+                .onSuccess { Timber.i("Successfully submitted broken site feedback") }
+                .onFailure { Timber.w(it, "Failed to send broken site feedback") }
         }
-            .onSuccess { Timber.i("Successfully submitted broken site feedback") }
-            .onFailure { Timber.w(it, "Failed to send broken site feedback") }
     }
 
     override suspend fun sendUserRated() {
@@ -95,14 +101,14 @@ class FireAndForgetFeedbackSubmitter(
         pixel.fire(pixelName)
     }
 
-    private fun submitFeedbackAsync(
+    private fun submitFeedback(
         openEnded: String,
         rating: String,
         category: String? = null,
         subcategory: String? = null,
         url: String? = null
-    ): Deferred<Response<Void>> {
-        return feedbackService.submitFeedbackAsync(
+    ) {
+        feedbackService.submitFeedback(
             category = category,
             subcategory = subcategory,
             rating = rating,
@@ -113,7 +119,7 @@ class FireAndForgetFeedbackSubmitter(
             model = Build.MODEL,
             api = Build.VERSION.SDK_INT,
             atb = atbWithVariant()
-        )
+        ).execute()
     }
 
     private fun categoryFromMainReason(mainReason: MainReason): String {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index d0b918bae385..d99b6e048f21 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -34,11 +34,9 @@ import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedba
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import kotlinx.android.synthetic.main.include_toolbar.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import kotlin.coroutines.CoroutineContext
 
 
 class FeedbackActivity : DuckDuckGoActivity(),
@@ -47,10 +45,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
     ShareOpenEndedFeedbackFragment.OpenEndedFeedbackListener,
     MainReasonNegativeFeedbackFragment.MainReasonNegativeFeedbackListener,
     BrokenSiteNegativeFeedbackFragment.BrokenSiteFeedbackListener,
-    SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener, CoroutineScope {
-
-    override val coroutineContext: CoroutineContext
-        get() = Dispatchers.Main
+    SubReasonNegativeFeedbackFragment.DisambiguationNegativeFeedbackListener {
 
     private val viewModel: FeedbackViewModel by bindViewModel()
 
@@ -168,7 +163,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Positive feedback listeners
      */
     override fun userSelectedToRateApp() {
-        viewModel.userSelectedToRateApp()
+        GlobalScope.launch { viewModel.userSelectedToRateApp() }
     }
 
     override fun userSelectedToGiveFeedback() {
@@ -176,11 +171,11 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     override fun userGavePositiveFeedbackNoDetails() {
-        launch { viewModel.userGavePositiveFeedbackNoDetails() }
+        GlobalScope.launch { viewModel.userGavePositiveFeedbackNoDetails() }
     }
 
     override fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        launch { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
+        GlobalScope.launch { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
     }
 
 
@@ -188,7 +183,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback listeners
      */
     override fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        launch { viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback) }
+        GlobalScope.launch { viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback) }
     }
 
     /**
@@ -223,7 +218,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback, broken site
      */
     override fun onProvidedBrokenSiteFeedback(feedback: String, url: String?) {
-        launch { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
+        GlobalScope.launch { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 85e6e020a5d4..2a2ac19f1a42 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -158,28 +158,28 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        command.value = Command.Exit(feedbackSubmitted = true)
+        command.postValue(Command.Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
     }
 
     suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-        command.value = Command.Exit(feedbackSubmitted = true)
+        command.postValue(Command.Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
     }
 
     suspend fun userGavePositiveFeedbackNoDetails() {
-        command.value = Command.Exit(feedbackSubmitted = true)
+        command.postValue(Command.Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
     }
 
     suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        command.value = Command.Exit(feedbackSubmitted = true)
+        command.postValue(Command.Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
@@ -225,12 +225,11 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
         )
     }
 
-    fun userSelectedToRateApp() {
+    suspend fun userSelectedToRateApp() {
+        command.postValue(Command.Exit(feedbackSubmitted = true))
         GlobalScope.launch(Dispatchers.IO) {
             feedbackSubmitter.sendUserRated()
         }
-
-        command.value = Command.Exit(feedbackSubmitted = true)
     }
 
     companion object {

From 581d7d91b6a47f0c0dde802177f2188f62091261 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Mon, 25 Mar 2019 14:10:01 +0000
Subject: [PATCH 35/47] Update api call to include broken site reason

---
 .../app/feedback/api/FeedbackSubmitter.kt     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index 269f9ef49d34..47e11f717be8 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -55,7 +55,14 @@ class FireAndForgetFeedbackSubmitter(
         sendPixel(pixelForNegativeFeedback(category, subcategory))
 
         GlobalScope.launch {
-            runCatching { submitFeedback(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, category = category, subcategory = subcategory) }
+            runCatching {
+                submitFeedback(
+                    openEnded = openEnded,
+                    rating = NEGATIVE_FEEDBACK,
+                    category = category,
+                    subcategory = subcategory
+                )
+            }
                 .onSuccess { Timber.i("Successfully submitted feedback") }
                 .onFailure { Timber.w(it, "Failed to send feedback") }
         }
@@ -84,7 +91,12 @@ class FireAndForgetFeedbackSubmitter(
 
         GlobalScope.launch {
             runCatching {
-                submitFeedback(openEnded = openEnded, rating = NEGATIVE_FEEDBACK, url = brokenSite, category = category)
+                submitFeedback(
+                    reason = FeedbackService.REASON_BROKEN_SITE,
+                    rating = NEGATIVE_FEEDBACK,
+                    url = brokenSite,
+                    openEnded = openEnded,
+                    category = category)
             }
                 .onSuccess { Timber.i("Successfully submitted broken site feedback") }
                 .onFailure { Timber.w(it, "Failed to send broken site feedback") }
@@ -106,9 +118,11 @@ class FireAndForgetFeedbackSubmitter(
         rating: String,
         category: String? = null,
         subcategory: String? = null,
-        url: String? = null
+        url: String? = null,
+        reason: String = FeedbackService.REASON_GENERAL
     ) {
         feedbackService.submitFeedback(
+            reason = reason,
             category = category,
             subcategory = subcategory,
             rating = rating,

From c11c073c4bc60455af28fe820ffb0fb1458adf83 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 11:57:38 +0000
Subject: [PATCH 36/47] Update legacy broken site dialog to be only about
 broken sites

---
 .../feedback/ui/BrokenSiteViewModelTest.kt    | 67 +++----------------
 .../app/brokensite/BrokenSiteActivity.kt      | 19 +-----
 .../app/brokensite/BrokenSiteViewModel.kt     | 36 ++--------
 .../app/brokensite/api/BrokenSiteSender.kt    | 18 +----
 .../duckduckgo/app/browser/BrowserActivity.kt |  2 +-
 .../app/feedback/api/FeedbackSubmitter.kt     |  1 -
 ...6dp.xml => ic_icon_report_broken_site.xml} | 14 ++--
 .../main/res/layout/activity_broken_site.xml  | 33 ++++-----
 app/src/main/res/values/strings.xml           |  7 +-
 app/src/main/res/values/themes.xml            |  2 +-
 10 files changed, 50 insertions(+), 149 deletions(-)
 rename app/src/main/res/drawable/{ic_icon_heart_26dp.xml => ic_icon_report_broken_site.xml} (54%)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
index f5d32f609ca4..eec03560bb28 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
@@ -57,83 +57,54 @@ class BrokenSiteViewModelTest {
     }
 
     @Test
-    fun whenBrokenUrlSwitchedOnWithNoUrlThenUrlFocused() {
-        testee.onBrokenSiteUrlChanged(null)
-        testee.onBrokenSiteChanged(true)
+    fun whenNoUrlProvidedThenUrlFocused() {
+        testee.setInitialBrokenSite(null)
         verify(mockCommandObserver).onChanged(Command.FocusUrl)
     }
 
     @Test
-    fun whenBrokenUrlSwitchedOnWithUrlThenMessageFocused() {
-        testee.onBrokenSiteUrlChanged(url)
-        testee.onBrokenSiteChanged(true)
+    fun whenUrlProvidedThenMessageFocused() {
+        testee.setInitialBrokenSite(url)
         verify(mockCommandObserver).onChanged(Command.FocusMessage)
     }
 
     @Test
-    fun whenBrokenUrlOnWithUrlAndMessageThenCanSubmit() {
-        testee.onBrokenSiteChanged(true)
+    fun whenUrlAndMessageNotEmptyThenCanSubmit() {
         testee.onBrokenSiteUrlChanged(url)
         testee.onFeedbackMessageChanged(message)
         assertTrue(viewState.submitAllowed)
     }
 
     @Test
-    fun whenBrokenUrlOnWithNullUrlThenCannotSubmit() {
-        testee.onBrokenSiteChanged(true)
+    fun whenNullUrlThenCannotSubmit() {
         testee.onBrokenSiteUrlChanged(null)
         testee.onFeedbackMessageChanged(message)
         assertFalse(viewState.submitAllowed)
     }
 
     @Test
-    fun whenBrokenUrlOnWithNullMessageThenCannotSubmit() {
-        testee.onBrokenSiteChanged(true)
-        testee.onBrokenSiteUrlChanged(url)
-        testee.onFeedbackMessageChanged(null)
-        assertFalse(viewState.submitAllowed)
-    }
-
-    @Test
-    fun whenBrokenUrlOnWithBlankUrlThenCannotSubmit() {
-        testee.onBrokenSiteChanged(true)
+    fun whenEmptyUrlThenCannotSubmit() {
         testee.onBrokenSiteUrlChanged(" ")
         testee.onFeedbackMessageChanged(message)
         assertFalse(viewState.submitAllowed)
     }
 
     @Test
-    fun whenBrokenUrlOnWithBlankMessageThenCannotSubmit() {
-        testee.onBrokenSiteChanged(true)
+    fun whenNullMessageThenCannotSubmit() {
         testee.onBrokenSiteUrlChanged(url)
-        testee.onFeedbackMessageChanged(" ")
-        assertFalse(viewState.submitAllowed)
-    }
-
-    @Test
-    fun whenBrokenUrlOffWithMessageThenCanSubmit() {
-        testee.onBrokenSiteChanged(false)
-        testee.onFeedbackMessageChanged(message)
-        assertTrue(viewState.submitAllowed)
-    }
-
-    @Test
-    fun whenBrokenUrlOffWithNullMessageThenCannotSubmit() {
-        testee.onBrokenSiteChanged(false)
         testee.onFeedbackMessageChanged(null)
         assertFalse(viewState.submitAllowed)
     }
 
     @Test
-    fun whenBrokenUrlOffWithBlankMessageThenCannotSubmit() {
-        testee.onBrokenSiteChanged(false)
+    fun whenEmptyMessageThenCannotSubmit() {
+        testee.onBrokenSiteUrlChanged(url)
         testee.onFeedbackMessageChanged(" ")
         assertFalse(viewState.submitAllowed)
     }
 
     @Test
     fun whenCanSubmitBrokenSiteAndSubmitPressedThenFeedbackSubmitted() {
-        testee.onBrokenSiteChanged(true)
         testee.onBrokenSiteUrlChanged(url)
         testee.onFeedbackMessageChanged(message)
         testee.onSubmitPressed()
@@ -144,29 +115,11 @@ class BrokenSiteViewModelTest {
 
     @Test
     fun whenCannotSubmitBrokenSiteAndSubmitPressedThenFeedbackNotSubmitted() {
-        testee.onBrokenSiteChanged(true)
         testee.onSubmitPressed()
         verify(mockBrokenSiteSender, never()).submitBrokenSiteFeedback(any(), any())
         verify(mockCommandObserver, never()).onChanged(Command.ConfirmAndFinish)
     }
 
-    @Test
-    fun whenCanSubmitMessageAndSubmitPressedThenFeedbackSubmitted() {
-        testee.onBrokenSiteChanged(false)
-        testee.onFeedbackMessageChanged(message)
-        testee.onSubmitPressed()
-        verify(mockBrokenSiteSender).submitGeneralFeedback(message)
-        verify(mockCommandObserver).onChanged(Command.ConfirmAndFinish)
-    }
-
-    @Test
-    fun whenCannotSubmitMessageAndSubmitPressedThenFeedbackNotSubmitted() {
-        testee.onBrokenSiteChanged(false)
-        testee.onSubmitPressed()
-        verify(mockBrokenSiteSender, never()).submitGeneralFeedback(any())
-        verify(mockCommandObserver, never()).onChanged(Command.ConfirmAndFinish)
-    }
-
     companion object Constants {
         private const val url = "http://example.com"
         private const val message = "Feedback message"
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
index a4d3625ea44d..02aa8194f814 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt
@@ -21,7 +21,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.widget.EditText
-import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.brokensite.BrokenSiteViewModel.Command
 import com.duckduckgo.app.brokensite.BrokenSiteViewModel.ViewState
@@ -48,17 +47,11 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
     }
 
     private fun consumeIntentExtra() {
-        val brokenSite = intent.getBooleanExtra(BROKEN_SITE_EXTRA, false)
-        if (brokenSite) {
-            val url = intent.getStringExtra(URL_EXTRA)
-            viewModel.setInitialBrokenSite(url)
-        }
+        val url = intent.getStringExtra(URL_EXTRA)
+        viewModel.setInitialBrokenSite(url)
     }
 
     private fun configureListeners() {
-        brokenSiteSwitch.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.onBrokenSiteChanged(isChecked)
-        }
         feedbackMessage.addTextChangedListener(object : TextChangedWatcher() {
             override fun afterTextChanged(editable: Editable) {
                 viewModel.onFeedbackMessageChanged(editable.toString())
@@ -97,11 +90,7 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
     }
 
     private fun render(viewState: ViewState) {
-        val messageHint = if (viewState.isBrokenSite) R.string.brokenSiteBrokenSiteHint else R.string.brokenSiteMessageHint
-        brokenSiteSwitch.isChecked = viewState.isBrokenSite
-        brokenSiteUrl.isVisible = viewState.showUrl
         brokenSiteUrl.updateText(viewState.url ?: "")
-        feedbackMessage.setHint(messageHint)
         submitButton.isEnabled = viewState.submitAllowed
     }
 
@@ -113,12 +102,10 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
 
     companion object {
 
-        private const val BROKEN_SITE_EXTRA = "BROKEN_SITE_EXTRA"
         private const val URL_EXTRA = "URL_EXTRA"
 
-        fun intent(context: Context, brokenSite: Boolean = false, url: String? = null): Intent {
+        fun intent(context: Context, url: String? = null): Intent {
             val intent = Intent(context, BrokenSiteActivity::class.java)
-            intent.putExtra(BROKEN_SITE_EXTRA, brokenSite)
             if (url != null) {
                 intent.putExtra(URL_EXTRA, url)
             }
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
index 95a34d747b11..872ad7ac5a54 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
@@ -25,9 +25,7 @@ import com.duckduckgo.app.global.SingleLiveEvent
 class BrokenSiteViewModel(private val brokenSiteSender: BrokenSiteSender) : ViewModel() {
 
     data class ViewState(
-        val isBrokenSite: Boolean = false,
         val url: String? = null,
-        val showUrl: Boolean = false,
         val message: String? = null,
         val submitAllowed: Boolean = false
     )
@@ -49,21 +47,8 @@ class BrokenSiteViewModel(private val brokenSiteSender: BrokenSiteSender) : View
 
     fun setInitialBrokenSite(url: String?) {
         onBrokenSiteUrlChanged(url)
-        onBrokenSiteChanged(true)
-    }
-
-    fun onBrokenSiteChanged(isBroken: Boolean) {
-        if (isBroken == viewState.value?.isBrokenSite) {
-            return
-        }
-
-        viewState.value = viewState.value?.copy(
-            isBrokenSite = isBroken,
-            showUrl = isBroken,
-            submitAllowed = canSubmit(isBroken, viewValue.url, viewValue.message)
-        )
 
-        if (isBroken && viewValue.url.isNullOrBlank()) {
+        if (viewValue.url.isNullOrBlank()) {
             command.value = Command.FocusUrl
         } else {
             command.value = Command.FocusMessage
@@ -73,24 +58,24 @@ class BrokenSiteViewModel(private val brokenSiteSender: BrokenSiteSender) : View
     fun onBrokenSiteUrlChanged(newUrl: String?) {
         viewState.value = viewState.value?.copy(
             url = newUrl,
-            submitAllowed = canSubmit(viewValue.isBrokenSite, newUrl, viewValue.message)
+            submitAllowed = canSubmit(newUrl, viewValue.message)
         )
     }
 
     fun onFeedbackMessageChanged(newMessage: String?) {
         viewState.value = viewState.value?.copy(
             message = newMessage,
-            submitAllowed = canSubmit(viewValue.isBrokenSite, viewValue.url, newMessage)
+            submitAllowed = canSubmit(viewValue.url, newMessage)
         )
     }
 
-    private fun canSubmit(isBrokenSite: Boolean, url: String?, feedbackMessage: String?): Boolean {
+    private fun canSubmit(url: String?, feedbackMessage: String?): Boolean {
 
         if (feedbackMessage.isNullOrBlank()) {
             return false
         }
 
-        if (isBrokenSite && url.isNullOrBlank()) {
+        if (url.isNullOrBlank()) {
             return false
         }
 
@@ -98,17 +83,10 @@ class BrokenSiteViewModel(private val brokenSiteSender: BrokenSiteSender) : View
     }
 
     fun onSubmitPressed() {
-
         val message = viewValue.message ?: return
+        val url = viewValue.url ?: return
 
-        if (viewValue.isBrokenSite) {
-            val url = viewValue.url ?: return
-            brokenSiteSender.submitBrokenSiteFeedback(message, url)
-        } else {
-            brokenSiteSender.submitGeneralFeedback(message)
-        }
-
+        brokenSiteSender.submitBrokenSiteFeedback(message, url)
         command.value = Command.ConfirmAndFinish
     }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
index 2002cb5ba112..f2a509b1eaef 100644
--- a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
+++ b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -19,8 +19,6 @@ package com.duckduckgo.app.brokensite.api
 import android.os.Build
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.feedback.api.FeedbackService
-import com.duckduckgo.app.feedback.api.FeedbackService.Companion.REASON_BROKEN_SITE
-import com.duckduckgo.app.feedback.api.FeedbackService.Companion.REASON_GENERAL
 import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import kotlinx.coroutines.Dispatchers
@@ -29,30 +27,20 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 
 interface BrokenSiteSender {
-    fun submitGeneralFeedback(comment: String)
     fun submitBrokenSiteFeedback(comment: String, url: String)
 }
 
 class BrokenSiteSubmitter(
-        private val statisticsStore: StatisticsDataStore,
-        private val variantManager: VariantManager,
-        private val service: FeedbackService
+    private val statisticsStore: StatisticsDataStore,
+    private val variantManager: VariantManager,
+    private val service: FeedbackService
 ) : BrokenSiteSender {
 
-    override fun submitGeneralFeedback(comment: String) {
-        submitFeedback(comment = comment, reason = REASON_GENERAL)
-    }
-
     override fun submitBrokenSiteFeedback(comment: String, url: String) {
-        submitFeedback(comment, url, reason = REASON_BROKEN_SITE)
-    }
-
-    private fun submitFeedback(comment: String, url: String? = null, reason: String) {
         GlobalScope.launch(Dispatchers.IO) {
 
             runCatching {
                 service.submitBrokenSite(
-                    reason = reason,
                     url = url,
                     comment = comment,
                     api = Build.VERSION.SDK_INT,
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
index 411ffe71bc25..208b24d97f2e 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt
@@ -267,7 +267,7 @@ class BrowserActivity : DuckDuckGoActivity() {
 
     fun launchBrokenSiteFeedback(url: String?) {
         val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
-        startActivity(BrokenSiteActivity.intent(this, true, url), options)
+        startActivity(BrokenSiteActivity.intent(this, url), options)
     }
 
     fun launchSettings() {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
index 47e11f717be8..46bf7de1af90 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/api/FeedbackSubmitter.kt
@@ -92,7 +92,6 @@ class FireAndForgetFeedbackSubmitter(
         GlobalScope.launch {
             runCatching {
                 submitFeedback(
-                    reason = FeedbackService.REASON_BROKEN_SITE,
                     rating = NEGATIVE_FEEDBACK,
                     url = brokenSite,
                     openEnded = openEnded,
diff --git a/app/src/main/res/drawable/ic_icon_heart_26dp.xml b/app/src/main/res/drawable/ic_icon_report_broken_site.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_icon_heart_26dp.xml
rename to app/src/main/res/drawable/ic_icon_report_broken_site.xml
index b50ca645b1ec..9c230873979a 100644
--- a/app/src/main/res/drawable/ic_icon_heart_26dp.xml
+++ b/app/src/main/res/drawable/ic_icon_report_broken_site.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2018 DuckDuckGo
+  ~ Copyright (c) 2019 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
-        android:fillColor="#C1E4FF"
+        android:fillColor="#C8D6FF"
         android:fillType="evenOdd"
-        android:pathData="M19.392,14.26l-6.285,6.286L6.82,14.26c-1.258,-1.212 -1.797,-3.726 -0.898,-5.387 0.493,-0.898 3.411,-3.906 7.183,0.449 3.59,-4.355 6.688,-1.347 7.183,-0.45 0.898,1.663 0.359,4.176 -0.897,5.388M13.051,0C5.898,0 0.1,5.798 0.1,12.95c0,2.625 0.782,5.065 2.124,7.107L0,25.902l5.474,-2.45a12.897,12.897 0,0 0,7.576 2.45C20.2,25.902 26,20.103 26,12.95 26.001,5.798 20.203,0 13.05,0" />
+        android:pathData="M16.05,3C23.204,3 29.002,8.798 29,15.95c0,7.153 -5.8,12.952 -12.95,12.952 -2.83,0 -5.445,-0.912 -7.576,-2.45L3,28.901l2.225,-5.845A12.893,12.893 0,0 1,3.1 15.95C3.1,8.798 8.898,3 16.05,3zM16,9a1.79,1.79 0,0 0,-1.78 1.988l0.67,6.018a1.117,1.117 0,0 0,2.22 0l0.67,-6.018A1.79,1.79 0,0 0,16 9zM16,23a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z" />
 </vector>
diff --git a/app/src/main/res/layout/activity_broken_site.xml b/app/src/main/res/layout/activity_broken_site.xml
index e46c77b551d1..c002e76be074 100644
--- a/app/src/main/res/layout/activity_broken_site.xml
+++ b/app/src/main/res/layout/activity_broken_site.xml
@@ -17,17 +17,17 @@
 <ScrollView 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="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     tools:context="com.duckduckgo.app.brokensite.BrokenSiteActivity">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/feedbackCardHorizontalMargin"
             android:layout_marginTop="@dimen/feedbackCardVerticalMargin"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="30dp"
                 android:elevation="@dimen/modalCardHeaderElevation"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_icon_heart_26dp"
+                android:src="@drawable/ic_icon_report_broken_site"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@id/titleSection" />
@@ -90,24 +90,21 @@
                 android:textAlignment="center"
                 android:textColor="@color/white"
                 android:textSize="@dimen/modalCardDescriptionTextSize"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/title" />
 
-            <androidx.appcompat.widget.SwitchCompat
-                android:id="@+id/brokenSiteSwitch"
+            <TextView
+                android:id="@+id/brokenDomainLabel"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/feedbackFormFieldsMargin"
-                android:fontFamily="sans-serif-medium"
-                android:paddingStart="3dp"
-                android:paddingEnd="0dp"
-                android:text="@string/brokenSiteReportBrokenSite"
+                android:text="@string/brokenSiteDomainLabel"
                 android:textColor="@color/warmerGray"
-                android:textSize="@dimen/modalCardSwitchTextSize"
-                android:textStyle="normal"
+                android:textSize="15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/description"
-                tools:checked="true" />
+                app:layout_constraintTop_toBottomOf="@id/description" />
 
             <EditText
                 android:id="@+id/brokenSiteUrl"
@@ -117,15 +114,13 @@
                 android:hint="@string/brokenSiteUrlHint"
                 android:imeOptions="flagNoExtractUi"
                 android:inputType="textUri"
-                android:paddingTop="16dp"
+                android:paddingTop="8dp"
                 android:paddingBottom="16dp"
                 android:singleLine="true"
                 android:textSize="@dimen/modalCardEditTextSize"
-                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/brokenSiteSwitch"
-                tools:visibility="visible" />
+                app:layout_constraintTop_toBottomOf="@id/brokenDomainLabel" />
 
             <EditText
                 android:id="@+id/feedbackMessage"
@@ -148,7 +143,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="30dp"
                 android:layout_marginEnd="20dp"
                 android:layout_marginBottom="30dp"
                 android:background="@drawable/button_contained_bg"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c4e6d672c15..06a58540ab8d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -180,11 +180,12 @@
     <!-- Broken Site Activity -->
     <string name="brokenSiteActivityTitle">Share Your Feedback</string>
     <string name="brokenSiteReportBrokenSiteMenuItem">Report Broken Site</string>
-    <string name="brokenSiteHeading">Share Your Feedback</string>
-    <string name="brokenSiteModalDescription">Anonymously share your feedback to help us improve the DuckDuckGo Privacy Browser</string>
+    <string name="brokenSiteHeading">Report a Broken Site</string>
+    <string name="brokenSiteModalDescription">Broken site reporting is completely anonymous and helps us improve the app!</string>
     <string name="brokenSiteReportBrokenSite">Report a broken site</string>
     <string name="brokenSiteUrlHint">Enter URL</string>
-    <string name="brokenSiteMessageHint">How can the app be improved? What do you love? What\'s breaking? Please be as specific as possible.</string>
+    <string name="brokenSiteDomainLabel">Domain of broken site:</string>
+    <string name="brokenSiteMessageHint">Which content or functionality is breaking?</string>
     <string name="brokenSiteBrokenSiteHint">Which website content or functionality is breaking? Please be as specific as possible.</string>
     <string name="brokenSiteSubmitButton">Submit Feedback</string>
     <string name="brokenSiteSubmitted">Thank you! Feedback submitted</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 616c3f5e5f6d..41b76c75626d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -128,7 +128,7 @@
     <style name="ModalCardTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/darkThemePrimary</item>
         <item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
-        <item name="colorAccent">@color/midGreen</item>
+        <item name="colorAccent">@color/cornflowerBlue</item>
         <item name="android:windowBackground">@color/translucentDark</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:colorBackgroundCacheHint">@null</item>

From d9b118bf526ecfdd2cd642508c720547fb5bf1af Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 12:03:41 +0000
Subject: [PATCH 37/47] Code tidy from PR feedback

---
 .../feedback/ui/BrokenSiteViewModelTest.kt    |  2 +-
 .../ui/common/FeedbackViewModelTest.kt        | 36 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
index eec03560bb28..fdd56faeee7c 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/BrokenSiteViewModelTest.kt
@@ -42,7 +42,7 @@ class BrokenSiteViewModelTest {
     @Before
     fun before() {
         MockitoAnnotations.initMocks(this)
-        testee = com.duckduckgo.app.brokensite.BrokenSiteViewModel(mockBrokenSiteSender)
+        testee = BrokenSiteViewModel(mockBrokenSiteSender)
         testee.command.observeForever(mockCommandObserver)
     }
 
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
index 57a82da74368..3fe629ca9057 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -75,7 +75,7 @@ class FeedbackViewModelTest {
         configureRatingCanBeGiven()
         testee.userSelectedPositiveFeedback()
         assertTrue(fragmentViewState is FragmentState.PositiveFeedbackFirstStep)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -84,7 +84,7 @@ class FeedbackViewModelTest {
         configureRatingCannotBeGiven()
         testee.userSelectedPositiveFeedback()
         assertTrue(fragmentViewState is FragmentState.PositiveShareFeedback)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -95,7 +95,7 @@ class FeedbackViewModelTest {
         testee.onBackPressed()
 
         assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -184,7 +184,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsInitialSadFaceThenFragmentStateIsFirstStepOfUnhappyFlow() {
         testee.userSelectedNegativeFeedback()
         assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -193,7 +193,7 @@ class FeedbackViewModelTest {
         testee.userSelectedNegativeFeedback()
         testee.onBackPressed()
         assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -201,7 +201,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonMissingBrowserFeaturesThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -209,7 +209,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonNotEnoughCustomizationsThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(NOT_ENOUGH_CUSTOMIZATIONS)
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -217,7 +217,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonSearchNotGoodEnoughThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(SEARCH_NOT_GOOD_ENOUGH)
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -225,7 +225,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonAppIsSlowOrBuggyThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(APP_IS_SLOW_OR_BUGGY)
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -233,7 +233,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonOtherThenFragmentStateIsOpenEndedFeedback() {
         testee.userSelectedNegativeFeedbackMainReason(OTHER)
         assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -241,7 +241,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsMainNegativeReasonBrokenSiteThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(WEBSITES_NOT_LOADING)
         assertTrue(fragmentViewState is NegativeWebSitesBrokenFeedback)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -249,7 +249,7 @@ class FeedbackViewModelTest {
     fun whenUserSelectsSubNegativeReasonThenFragmentStateIsOpenEndedFeedback() {
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
         assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
-        verifyNavigatingForwards(fragmentViewState)
+        verifyForwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -258,7 +258,7 @@ class FeedbackViewModelTest {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
         testee.onBackPressed()
         assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -268,7 +268,7 @@ class FeedbackViewModelTest {
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
         testee.onBackPressed()
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -277,7 +277,7 @@ class FeedbackViewModelTest {
         testee.userSelectedNegativeFeedbackMainReason(OTHER)
         testee.onBackPressed()
         assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
     @Test
@@ -287,14 +287,14 @@ class FeedbackViewModelTest {
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
         testee.onBackPressed()
         assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyNavigatingBack(fragmentViewState)
+        verifyBackwardsNavigation(fragmentViewState)
     }
 
-    private fun verifyNavigatingForwards(fragmentViewState: FragmentState?) {
+    private fun verifyForwardsNavigation(fragmentViewState: FragmentState?) {
         assertTrue(fragmentViewState?.forwardDirection == true)
     }
 
-    private fun verifyNavigatingBack(fragmentViewState: FragmentState?) {
+    private fun verifyBackwardsNavigation(fragmentViewState: FragmentState?) {
         assertTrue(fragmentViewState?.forwardDirection == false)
     }
 

From 44fd81a430c718e47de670dcb87ca702587f791d Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 12:11:59 +0000
Subject: [PATCH 38/47] Remove unused assets

---
 app/src/main/AndroidManifest.xml              |  4 ++--
 .../res/color/feedback_input_box_border.xml   | 22 -------------------
 app/src/main/res/values-sw600dp/dimens.xml    |  1 -
 app/src/main/res/values/dimens.xml            |  1 -
 .../strings-feedback-disambiguation.xml       |  2 +-
 app/src/main/res/values/strings.xml           |  1 -
 6 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/res/color/feedback_input_box_border.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ca0a7af2d1c..39b88fcd7dc4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -110,11 +110,11 @@
         <activity
             android:name="com.duckduckgo.app.feedback.ui.common.FeedbackActivity"
             android:windowSoftInputMode="adjustResize"
-            android:label="@string/brokenSiteActivityTitle" />
+            android:label="@string/feedbackActivityTitle" />
         <activity
             android:name="com.duckduckgo.app.brokensite.BrokenSiteActivity"
             android:theme="@style/ModalCardTheme"
-            android:label="@string/brokenSiteActivityTitle" />
+            android:label="@string/brokenSiteHeading" />
         <activity
             android:name="com.duckduckgo.app.feedback.ui.SurveyActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/app/src/main/res/color/feedback_input_box_border.xml b/app/src/main/res/color/feedback_input_box_border.xml
deleted file mode 100644
index 5b1ceacd1a8f..000000000000
--- a/app/src/main/res/color/feedback_input_box_border.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2019 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:color="#F00" android:state_focused="true" />
-    <item android:color="#34F" android:state_hovered="true" />
-    <item android:color="#080" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index c4311b2febd7..bfbcba60923f 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -24,7 +24,6 @@
 
     <dimen name="modalCardTitleTextSize">30sp</dimen>
     <dimen name="modalCardDescriptionTextSize">20sp</dimen>
-    <dimen name="modalCardSwitchTextSize">20sp</dimen>
     <dimen name="modalCardEditTextSize">20sp</dimen>
     <dimen name="modalCardMajorButtonTextSize">20sp</dimen>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5749fb19ab89..0ca636776876 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,6 @@
 
     <dimen name="modalCardTitleTextSize">20sp</dimen>
     <dimen name="modalCardDescriptionTextSize">14sp</dimen>
-    <dimen name="modalCardSwitchTextSize">16sp</dimen>
     <dimen name="modalCardEditTextSize">14sp</dimen>
     <dimen name="modalCardHeaderElevation">4dp</dimen>
     <dimen name="modalCardMajorButtonTextSize">15sp</dimen>
diff --git a/app/src/main/res/values/strings-feedback-disambiguation.xml b/app/src/main/res/values/strings-feedback-disambiguation.xml
index 80b8e4242e78..5592737c3817 100644
--- a/app/src/main/res/values/strings-feedback-disambiguation.xml
+++ b/app/src/main/res/values/strings-feedback-disambiguation.xml
@@ -15,7 +15,7 @@
   -->
 
 <resources>
-
+    <string name="feedbackActivityTitle">Share Your Feedback</string>
     <string name="missingBrowserFeaturesTitleLong">Browser features are missing or frustrating</string>
     <string name="missingBrowserFeaturesTitleShort">Browser Feature Issues</string>
     <string name="missingBrowserFeaturesSubtitle">Which browsing feature can we add or improve?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 06a58540ab8d..2feef0ebb063 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,7 +178,6 @@
     <string name="no_suggestions">No Suggestions</string>
 
     <!-- Broken Site Activity -->
-    <string name="brokenSiteActivityTitle">Share Your Feedback</string>
     <string name="brokenSiteReportBrokenSiteMenuItem">Report Broken Site</string>
     <string name="brokenSiteHeading">Report a Broken Site</string>
     <string name="brokenSiteModalDescription">Broken site reporting is completely anonymous and helps us improve the app!</string>

From 636c56476dcd00658506cfb475450aae43b347e9 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 12:37:35 +0000
Subject: [PATCH 39/47] Move all survey-related classes to the survey package

---
 .../app/browser/BrowserTabViewModelTest.kt    |  2 +-
 .../duckduckgo/app/cta/ui/CtaViewModelTest.kt |  6 +++---
 .../api/SurveyDownloaderTest.kt               | 15 ++++++---------
 .../{feedback => survey}/db/SurveyDaoTest.kt  |  8 ++++----
 .../ui/SurveyViewModelTest.kt                 | 14 +++++++-------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../app/browser/BrowserTabFragment.kt         | 10 +++++-----
 .../app/browser/BrowserTabViewModel.kt        |  2 +-
 .../com/duckduckgo/app/cta/ui/CtaViewModel.kt |  6 +++---
 .../duckduckgo/app/di/AndroidBindingModule.kt |  2 +-
 .../ui/negative/FeedbackTypeDisplay.kt        |  1 -
 .../SubReasonNegativeFeedbackFragment.kt      |  2 +-
 .../duckduckgo/app/global/ViewModelFactory.kt |  4 ++--
 .../duckduckgo/app/global/db/AppDatabase.kt   |  4 ++--
 .../app/settings/SettingsActivity.kt          |  6 +++---
 .../duckduckgo/app/statistics/pixels/Pixel.kt |  2 +-
 .../app/survey/api/SurveyDownloader.kt        |  8 ++++----
 .../app/{feedback => survey}/db/SurveyDao.kt  |  6 +++---
 .../app/{feedback => survey}/model/Survey.kt  |  2 +-
 .../{feedback => survey}/ui/SurveyActivity.kt | 19 +++++++------------
 .../ui/SurveyViewModel.kt                     |  8 ++++----
 app/src/main/res/layout/content_feedback.xml  |  4 ++--
 22 files changed, 62 insertions(+), 71 deletions(-)
 rename app/src/androidTest/java/com/duckduckgo/app/{feedback => survey}/api/SurveyDownloaderTest.kt (88%)
 rename app/src/androidTest/java/com/duckduckgo/app/{feedback => survey}/db/SurveyDaoTest.kt (94%)
 rename app/src/androidTest/java/com/duckduckgo/app/{feedback => survey}/ui/SurveyViewModelTest.kt (92%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/db/SurveyDao.kt (93%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/model/Survey.kt (96%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/ui/SurveyActivity.kt (90%)
 rename app/src/main/java/com/duckduckgo/app/{feedback => survey}/ui/SurveyViewModel.kt (95%)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
index aeecc70e7dbe..c637f0dc9453 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -40,7 +40,7 @@ import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.feedback.db.SurveyDao
+import com.duckduckgo.app.survey.db.SurveyDao
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.db.AppConfigurationEntity
 import com.duckduckgo.app.global.db.AppDatabase
diff --git a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt
index 217b92d64605..2ccf0b0a8997 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt
@@ -23,13 +23,13 @@ import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId
 import com.duckduckgo.app.cta.model.DismissedCta
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
 import com.duckduckgo.app.global.db.AppDatabase
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.SCHEDULED
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.eq
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt
similarity index 88%
rename from app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt
rename to app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt
index e66d2e1ccc22..f947cefae092 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/api/SurveyDownloaderTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/survey/api/SurveyDownloaderTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,13 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.api
+package com.duckduckgo.app.survey.api
 
 import com.duckduckgo.app.InstantSchedulersRule
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.NOT_ALLOCATED
-import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
-import com.duckduckgo.app.survey.api.SurveyDownloader
-import com.duckduckgo.app.survey.api.SurveyGroup
-import com.duckduckgo.app.survey.api.SurveyService
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.NOT_ALLOCATED
+import com.duckduckgo.app.survey.model.Survey.Status.SCHEDULED
 import com.nhaarman.mockitokotlin2.*
 import okhttp3.ResponseBody
 import org.junit.Rule
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/db/SurveyDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt
similarity index 94%
rename from app/src/androidTest/java/com/duckduckgo/app/feedback/db/SurveyDaoTest.kt
rename to app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt
index 0a138277e4c3..16667cb0e044 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/db/SurveyDaoTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/survey/db/SurveyDaoTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.db
+package com.duckduckgo.app.survey.db
 
 import androidx.room.Room
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.*
 import com.duckduckgo.app.global.db.AppDatabase
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.*
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before
diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/SurveyViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt
similarity index 92%
rename from app/src/androidTest/java/com/duckduckgo/app/feedback/ui/SurveyViewModelTest.kt
rename to app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt
index c42e33e3b0a2..1c0c410f3636 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/SurveyViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/survey/ui/SurveyViewModelTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui
+package com.duckduckgo.app.survey.ui
 
 import android.os.Build
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
@@ -22,14 +22,14 @@ import androidx.core.net.toUri
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.browser.BuildConfig
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.DONE
-import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
-import com.duckduckgo.app.feedback.ui.SurveyViewModel.Command
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.statistics.model.Atb
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.DONE
+import com.duckduckgo.app.survey.model.Survey.Status.SCHEDULED
+import com.duckduckgo.app.survey.ui.SurveyViewModel.Command
 import com.nhaarman.mockitokotlin2.*
 import org.junit.After
 import org.junit.Assert.assertEquals
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 39b88fcd7dc4..d045c6bfb9e9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -116,7 +116,7 @@
             android:theme="@style/ModalCardTheme"
             android:label="@string/brokenSiteHeading" />
         <activity
-            android:name="com.duckduckgo.app.feedback.ui.SurveyActivity"
+            android:name="com.duckduckgo.app.survey.ui.SurveyActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/surveyActivityTitle"
             android:parentActivityName=".BrowserActivity"
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 868175a1f104..21cba3a3f484 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -72,13 +72,13 @@ import com.duckduckgo.app.browser.shortcut.ShortcutBuilder
 import com.duckduckgo.app.browser.useragent.UserAgentProvider
 import com.duckduckgo.app.cta.ui.CtaConfiguration
 import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.ui.SurveyActivity
 import com.duckduckgo.app.global.ViewModelFactory
 import com.duckduckgo.app.global.view.*
 import com.duckduckgo.app.privacy.model.PrivacyGrade
 import com.duckduckgo.app.privacy.renderer.icon
 import com.duckduckgo.app.statistics.pixels.Pixel
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.ui.SurveyActivity
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
 import com.duckduckgo.widget.SearchWidgetLight
@@ -525,9 +525,9 @@ class BrowserTabFragment : Fragment(), FindListener {
 
     private fun configureOmnibarTextInput() {
         omnibarTextInput.onFocusChangeListener =
-                View.OnFocusChangeListener { _, hasFocus: Boolean ->
-                    viewModel.onOmnibarInputStateChanged(omnibarTextInput.text.toString(), hasFocus, false)
-                }
+            View.OnFocusChangeListener { _, hasFocus: Boolean ->
+                viewModel.onOmnibarInputStateChanged(omnibarTextInput.text.toString(), hasFocus, false)
+            }
 
         omnibarTextInput.onBackKeyListener = object : KeyboardAwareEditText.OnBackKeyListener {
             override fun onBackKey(): Boolean {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
index 39f8d4cd17c0..fa0432da1dab 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -48,7 +48,6 @@ import com.duckduckgo.app.browser.omnibar.OmnibarEntryConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.ui.CtaConfiguration
 import com.duckduckgo.app.cta.ui.CtaViewModel
-import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.global.*
 import com.duckduckgo.app.global.db.AppConfigurationDao
 import com.duckduckgo.app.global.db.AppConfigurationEntity
@@ -60,6 +59,7 @@ import com.duckduckgo.app.privacy.db.SiteVisitedEntity
 import com.duckduckgo.app.privacy.model.PrivacyGrade
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
+import com.duckduckgo.app.survey.model.Survey
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.trackerdetection.model.TrackingEvent
diff --git a/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt b/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt
index 24c9997afd21..3f184b6ae725 100644
--- a/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt
@@ -27,12 +27,12 @@ import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId
 import com.duckduckgo.app.cta.model.DismissedCta
 import com.duckduckgo.app.cta.ui.CtaConfiguration.*
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.install.daysInstalled
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.*
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
 import com.duckduckgo.app.widget.ui.WidgetCapabilities
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.include_cta_buttons.view.*
@@ -147,7 +147,7 @@ sealed class CtaConfiguration(
     open val cancelPixel: Pixel.PixelName
 ) {
 
-    data class Survey(val survey: com.duckduckgo.app.feedback.model.Survey) : CtaConfiguration(
+    data class Survey(val survey: com.duckduckgo.app.survey.model.Survey) : CtaConfiguration(
         CtaId.SURVEY,
         R.drawable.survey_cta_icon,
         R.string.surveyCtaTitle,
diff --git a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
index 542b31ca94ed..6f6f33a650f4 100644
--- a/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
+++ b/app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt
@@ -25,7 +25,6 @@ import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserInfoActivity
 import com.duckduckgo.app.browser.rating.ui.AppEnjoymentDialogFragment
 import com.duckduckgo.app.browser.rating.ui.GiveFeedbackDialogFragment
 import com.duckduckgo.app.browser.rating.ui.RateAppDialogFragment
-import com.duckduckgo.app.feedback.ui.SurveyActivity
 import com.duckduckgo.app.feedback.ui.common.FeedbackActivity
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragment
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackFragment
@@ -44,6 +43,7 @@ import com.duckduckgo.app.privacy.ui.PrivacyPracticesActivity
 import com.duckduckgo.app.privacy.ui.ScorecardActivity
 import com.duckduckgo.app.privacy.ui.TrackerNetworksActivity
 import com.duckduckgo.app.settings.SettingsActivity
+import com.duckduckgo.app.survey.ui.SurveyActivity
 import com.duckduckgo.app.tabs.ui.TabSwitcherActivity
 import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
 import dagger.Module
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
index 35add9c869b4..ef7d5823708e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/FeedbackTypeDisplay.kt
@@ -27,7 +27,6 @@ import com.duckduckgo.app.feedback.ui.negative.FeedbackType.PerformanceSubReason
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.SearchNotGoodEnoughSubReasons.*
 
 fun MainReason.displayText(): FeedbackTypeDisplay.FeedbackTypeMainReasonDisplay? = FeedbackTypeDisplay.mainReasons[this]
-fun SubReason.displayText(): FeedbackTypeDisplay.FeedbackTypeSubReasonDisplay? = FeedbackTypeDisplay.subReasons[this]
 
 class FeedbackTypeDisplay {
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
index 3635d5cfd3d5..c6b88d46033e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonNegativeFeedbackFragment.kt
@@ -129,7 +129,7 @@ class SubReasonNegativeFeedbackFragment : FeedbackFragment() {
     }
 
     private fun appSlowOrBuggySubReasons(): List<FeedbackTypeSubReasonDisplay> {
-        return FeedbackType.PerformanceSubReasons.values().mapNotNull() {
+        return FeedbackType.PerformanceSubReasons.values().mapNotNull {
             FeedbackTypeDisplay.subReasons[it]
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
index b8c826781adc..629d812e642d 100644
--- a/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/ViewModelFactory.kt
@@ -31,8 +31,6 @@ import com.duckduckgo.app.browser.omnibar.QueryUrlConverter
 import com.duckduckgo.app.browser.session.WebViewSessionStorage
 import com.duckduckgo.app.cta.ui.CtaViewModel
 import com.duckduckgo.app.feedback.api.FeedbackSubmitter
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.ui.SurveyViewModel
 import com.duckduckgo.app.feedback.ui.common.FeedbackViewModel
 import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel
 import com.duckduckgo.app.feedback.ui.negative.brokensite.BrokenSiteNegativeFeedbackViewModel
@@ -60,6 +58,8 @@ 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.store.StatisticsDataStore
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.ui.SurveyViewModel
 import com.duckduckgo.app.tabs.model.TabRepository
 import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel
 import com.duckduckgo.app.usage.search.SearchCountDao
diff --git a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
index 7fdf73441472..66682ba95875 100644
--- a/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/db/AppDatabase.kt
@@ -31,8 +31,6 @@ import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.DismissedCta
 import com.duckduckgo.app.entities.db.EntityListDao
 import com.duckduckgo.app.entities.db.EntityListEntity
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.httpsupgrade.db.HttpsBloomFilterSpecDao
 import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
 import com.duckduckgo.app.httpsupgrade.model.HttpsBloomFilterSpec
@@ -42,6 +40,8 @@ import com.duckduckgo.app.notification.model.Notification
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardDao
 import com.duckduckgo.app.privacy.db.NetworkLeaderboardEntry
 import com.duckduckgo.app.privacy.db.SiteVisitedEntity
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
 import com.duckduckgo.app.tabs.db.TabsDao
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.model.TabSelectionEntity
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
index 38bc9371a959..4b0d9e7b9293 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -160,7 +160,7 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
 
     private fun launchFeedback() {
         val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
-        startActivityForResult(Intent(FeedbackActivity.intent(this)), FEEDBACK_RC, options)
+        startActivityForResult(Intent(FeedbackActivity.intent(this)), FEEDBACK_REQUEST_CODE, options)
     }
 
     override fun onAutomaticallyClearWhatOptionSelected(clearWhatSetting: ClearWhatOption) {
@@ -173,7 +173,7 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         when (requestCode) {
-            FEEDBACK_RC -> {
+            FEEDBACK_REQUEST_CODE -> {
                 handleFeedbackResult(resultCode)
             }
         }
@@ -210,7 +210,7 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
     companion object {
         private const val CLEAR_WHAT_DIALOG_TAG = "CLEAR_WHAT_DIALOG_FRAGMENT"
         private const val CLEAR_WHEN_DIALOG_TAG = "CLEAR_WHEN_DIALOG_FRAGMENT"
-        private const val FEEDBACK_RC = 100
+        private const val FEEDBACK_REQUEST_CODE = 100
 
         fun intent(context: Context): Intent {
             return Intent(context, SettingsActivity::class.java)
diff --git a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
index 15cc184d625e..e2d2acd8630c 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/pixels/Pixel.kt
@@ -141,7 +141,7 @@ class ApiBasedPixel @Inject constructor(
             .subscribe({
                 Timber.v("Pixel sent: $pixelName")
             }, {
-                Timber.w(it, "Pixel failed: $pixelName")
+                Timber.w("Pixel failed: $pixelName")
             })
     }
 
diff --git a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
index 9c980b3d393a..24e1f7b60c11 100644
--- a/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/api/SurveyDownloader.kt
@@ -17,10 +17,10 @@
 package com.duckduckgo.app.survey.api
 
 import com.duckduckgo.app.survey.api.SurveyGroup.SurveyOption
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.model.Survey.Status.NOT_ALLOCATED
-import com.duckduckgo.app.feedback.model.Survey.Status.SCHEDULED
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.model.Survey.Status.NOT_ALLOCATED
+import com.duckduckgo.app.survey.model.Survey.Status.SCHEDULED
 import io.reactivex.Completable
 import timber.log.Timber
 import java.io.IOException
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/db/SurveyDao.kt b/app/src/main/java/com/duckduckgo/app/survey/db/SurveyDao.kt
similarity index 93%
rename from app/src/main/java/com/duckduckgo/app/feedback/db/SurveyDao.kt
rename to app/src/main/java/com/duckduckgo/app/survey/db/SurveyDao.kt
index e32fe909e2b4..a8db876091f3 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/db/SurveyDao.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/db/SurveyDao.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.db
+package com.duckduckgo.app.survey.db
 
 import androidx.lifecycle.LiveData
 import androidx.room.*
-import com.duckduckgo.app.feedback.model.Survey
+import com.duckduckgo.app.survey.model.Survey
 
 @Dao
 abstract class SurveyDao {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/model/Survey.kt b/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt
similarity index 96%
rename from app/src/main/java/com/duckduckgo/app/feedback/model/Survey.kt
rename to app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt
index 4b217f2f52a4..6425091446d3 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/model/Survey.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/model/Survey.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.model
+package com.duckduckgo.app.survey.model
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyActivity.kt b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt
similarity index 90%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyActivity.kt
rename to app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt
index 19a050ab4395..cec9087d6b7e 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui
+package com.duckduckgo.app.survey.ui
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -24,15 +24,14 @@ import android.webkit.*
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.feedback.model.Survey
-import com.duckduckgo.app.feedback.ui.SurveyViewModel.Command
-import com.duckduckgo.app.feedback.ui.SurveyViewModel.Command.Close
-import com.duckduckgo.app.feedback.ui.SurveyViewModel.Command.LoadSurvey
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.gone
 import com.duckduckgo.app.global.view.show
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.SURVEY_SURVEY_DISMISSED
+import com.duckduckgo.app.survey.model.Survey
+import com.duckduckgo.app.survey.ui.SurveyViewModel.Command
+import com.duckduckgo.app.survey.ui.SurveyViewModel.Command.*
 import kotlinx.android.synthetic.main.activity_user_survey.*
 import javax.inject.Inject
 
@@ -84,12 +83,8 @@ class SurveyActivity : DuckDuckGoActivity() {
     private fun processCommand(command: Command) {
         when (command) {
             is LoadSurvey -> loadSurvey(command.url)
-            is Command.ShowSurvey -> {
-                showSurvey()
-            }
-            is Command.ShowError -> {
-                showError()
-            }
+            is ShowSurvey -> showSurvey()
+            is ShowError -> showError()
             is Close -> finish()
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyViewModel.kt b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt
similarity index 95%
rename from app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyViewModel.kt
rename to app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt
index 64cbad64dd1f..25711a8e8994 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/SurveyViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/survey/ui/SurveyViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 DuckDuckGo
+ * Copyright (c) 2019 DuckDuckGo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.feedback.ui
+package com.duckduckgo.app.survey.ui
 
 import android.os.Build
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.browser.BuildConfig
-import com.duckduckgo.app.feedback.db.SurveyDao
-import com.duckduckgo.app.feedback.model.Survey
 import com.duckduckgo.app.global.SingleLiveEvent
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.install.daysInstalled
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
+import com.duckduckgo.app.survey.db.SurveyDao
+import com.duckduckgo.app.survey.model.Survey
 import io.reactivex.schedulers.Schedulers
 
 
diff --git a/app/src/main/res/layout/content_feedback.xml b/app/src/main/res/layout/content_feedback.xml
index 4fd4835b0d9b..575922dd45db 100644
--- a/app/src/main/res/layout/content_feedback.xml
+++ b/app/src/main/res/layout/content_feedback.xml
@@ -50,7 +50,7 @@
             android:clickable="true"
             android:contentDescription="@string/feedbackInitialDisambiguationHappyButtonContentDescription"
             android:focusable="true"
-            tools:src="@drawable/ic_button_happy_light_theme"
+            tools:src="@drawable/button_happy_light_theme"
             app:layout_constraintEnd_toStartOf="@id/negativeFeedbackButton"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
@@ -62,7 +62,7 @@
             android:layout_height="100dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/feedbackInitialDisambiguationSadButtonContentDescription"
-            tools:src="@drawable/ic_button_sad_light_theme"
+            tools:src="@drawable/button_sad_light_theme"
             android:layout_marginStart="28dp"
             app:layout_constraintBottom_toBottomOf="@id/positiveFeedbackButton"
             app:layout_constraintEnd_toEndOf="parent"

From ff7ec327d892485a94a0a041e45b67ba399a70e6 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 13:03:44 +0000
Subject: [PATCH 40/47] Change from doOnPreDraw to doOnNextLayout to fix
 multi-window crash

---
 .../feedback/ui/common/FeedbackViewModel.kt   | 72 ++++++++++---------
 .../BrokenSiteNegativeFeedbackFragment.kt     |  7 +-
 .../ShareOpenEndedFeedbackFragment.kt         |  5 +-
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 2a2ac19f1a42..008e2c479c80 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -57,10 +57,10 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
             MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
         }
         viewState.value = currentViewState.copy(
-                fragmentViewState = newState,
-                mainReason = mainReason,
-                subReason = null,
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = null,
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -109,12 +109,12 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
         viewState.value = if (canShowRatingsButton()) {
             currentViewState.copy(
                 fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_FORWARDS),
-                    previousViewState = currentViewState.fragmentViewState
+                previousViewState = currentViewState.fragmentViewState
             )
         } else {
             currentViewState.copy(
-                    fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
-                    previousViewState = currentViewState.fragmentViewState
+                fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+                previousViewState = currentViewState.fragmentViewState
             )
         }
     }
@@ -140,8 +140,8 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedNegativeFeedback() {
         viewState.value = currentViewState.copy(
-                fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -152,8 +152,8 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedToGiveFeedback() {
         viewState.value = currentViewState.copy(
-                fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -188,40 +188,40 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-                fragmentViewState = newState,
-                mainReason = mainReason,
-                subReason = subReason,
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: FeedbackType.SearchNotGoodEnoughSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-                fragmentViewState = newState,
-                mainReason = mainReason,
-                subReason = subReason,
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: FeedbackType.CustomizationSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-                fragmentViewState = newState,
-                mainReason = mainReason,
-                subReason = subReason,
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
         viewState.value = currentViewState.copy(
-                fragmentViewState = newState,
-                mainReason = mainReason,
-                subReason = subReason,
-                previousViewState = currentViewState.fragmentViewState
+            fragmentViewState = newState,
+            mainReason = mainReason,
+            subReason = subReason,
+            previousViewState = currentViewState.fragmentViewState
         )
     }
 
@@ -239,10 +239,10 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 }
 
 data class ViewState(
-        val fragmentViewState: FragmentState,
-        val previousViewState: FragmentState? = null,
-        val mainReason: MainReason? = null,
-        val subReason: SubReason? = null
+    val fragmentViewState: FragmentState,
+    val previousViewState: FragmentState? = null,
+    val mainReason: MainReason? = null,
+    val subReason: SubReason? = null
 )
 
 sealed class FragmentState(open val forwardDirection: Boolean) {
@@ -250,18 +250,20 @@ sealed class FragmentState(open val forwardDirection: Boolean) {
 
     // positive flow
     data class PositiveFeedbackFirstStep(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
+
     data class PositiveShareFeedback(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
 
     // negative flow
     data class NegativeFeedbackMainReason(override val forwardDirection: Boolean) : FragmentState(forwardDirection)
+
     data class NegativeFeedbackSubReason(override val forwardDirection: Boolean, val mainReason: MainReason) : FragmentState(forwardDirection)
     data class NegativeOpenEndedFeedback(override val forwardDirection: Boolean, val mainReason: MainReason, val subReason: SubReason? = null) :
-            FragmentState(forwardDirection)
+        FragmentState(forwardDirection)
 
     data class NegativeWebSitesBrokenFeedback(
-            override val forwardDirection: Boolean,
-            val mainReason: MainReason,
-            val subReason: SubReason? = null
+        override val forwardDirection: Boolean,
+        val mainReason: MainReason,
+        val subReason: SubReason? = null
     ) : FragmentState(forwardDirection)
 }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
index 314408e333e4..4406678865a5 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/brokensite/BrokenSiteNegativeFeedbackFragment.kt
@@ -20,7 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.doOnPreDraw
+import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
@@ -58,7 +58,7 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
-        submitFeedbackButton.doOnPreDraw {
+        submitFeedbackButton.doOnNextLayout {
             brokenSiteInput.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, brokenSiteInputContainer.y.toInt()))
             openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
         }
@@ -67,7 +67,8 @@ class BrokenSiteNegativeFeedbackFragment : FeedbackFragment() {
             val feedback = openEndedFeedback.text.toString()
             val brokenSite = brokenSiteInput.text.toString()
 
-            viewModel.userSubmittingFeedback(feedback, brokenSite) }
+            viewModel.userSubmittingFeedback(feedback, brokenSite)
+        }
     }
 
     companion object {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
index 255d8593a625..2b4c93e9c347 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/openended/ShareOpenEndedFeedbackFragment.kt
@@ -20,7 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.doOnPreDraw
+import androidx.core.view.doOnNextLayout
 import androidx.lifecycle.Observer
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
@@ -123,8 +123,7 @@ class ShareOpenEndedFeedbackFragment : FeedbackFragment() {
     }
 
     override fun configureListeners() {
-
-        rootScrollView.doOnPreDraw {
+        rootScrollView.doOnNextLayout {
             openEndedFeedback.setOnTouchListener(LayoutScrollingTouchListener(rootScrollView, openEndedFeedbackContainer.y.toInt()))
         }
 

From 4cb730357158aab55d91cb7881f8493d65606389 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 13:05:48 +0000
Subject: [PATCH 41/47] Switch to if statement instead of a when with a single
 item in it

---
 .../java/com/duckduckgo/app/settings/SettingsActivity.kt    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
index 4b0d9e7b9293..fbfb43226c27 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -172,10 +172,8 @@ class SettingsActivity : DuckDuckGoActivity(), SettingsAutomaticallyClearWhatFra
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            FEEDBACK_REQUEST_CODE -> {
-                handleFeedbackResult(resultCode)
-            }
+        if (requestCode == FEEDBACK_REQUEST_CODE) {
+            handleFeedbackResult(resultCode)
         }
         super.onActivityResult(requestCode, resultCode, data)
     }

From e06a3d3cdf2ec598e7859c18c49c2751351c55c3 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 16:57:58 +0000
Subject: [PATCH 42/47] Add intent flag required to launch Play Store from
 non-activity context

---
 app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
index fc12e45ff273..e294e6446603 100644
--- a/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
+++ b/app/src/main/java/com/duckduckgo/app/playstore/PlayStoreUtils.kt
@@ -84,6 +84,7 @@ class PlayStoreAndroidUtils(val context: Context) : PlayStoreUtils {
 
     override fun launchPlayStore() {
         val intent = playStoreIntent()
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         try {
             context.startActivity(intent)
         } catch (e: ActivityNotFoundException) {

From 20183e15291967637b634a31ec9da37412413706 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Wed, 27 Mar 2019 16:59:44 +0000
Subject: [PATCH 43/47] Make cornflower blue the default accent color for the
 whole app

---
 app/src/main/res/values/colors.xml | 2 --
 app/src/main/res/values/themes.xml | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e3f29e9fa59d..351cdb60343d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,12 +19,10 @@
     <!-- Dark theme primary colors -->
     <color name="darkThemePrimaryDark">@color/almostBlackDark</color>
     <color name="darkThemePrimary">@color/almostBlack</color>
-    <color name="darkThemeAccent">@color/orange</color>
 
     <!-- Light theme primary colors -->
     <color name="lightThemePrimaryDark">@color/whiteThree</color>
     <color name="lightThemePrimary">@color/whiteFive</color>
-    <color name="lightThemeAccent">@color/orange</color>
 
     <!-- Widget colors -->
     <color name="divider">@color/subtleGrayTwo</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 41b76c75626d..3e826bda330f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -22,7 +22,7 @@
              such as the app launch color -->
         <item name="colorPrimary">@color/almostBlackDark</item>
         <item name="colorPrimaryDark">@color/almostBlackDark</item>
-
+        <item name="colorAccent">@color/cornflowerBlue</item>
         <item name="android:windowBackground">?attr/colorPrimaryDark</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -33,7 +33,6 @@
     <style name="AppTheme.BaseDark">
         <item name="colorPrimary">@color/darkThemePrimary</item>
         <item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>
-        <item name="colorAccent">@color/darkThemeAccent</item>
         <item name="daxLogoTextColor">@color/white</item>
         <item name="normalTextColor">@color/white</item>
         <item name="toolbarIconColor">@color/grayish</item>
@@ -87,7 +86,6 @@
     <style name="AppTheme.BaseLight">
         <item name="colorPrimary">@color/lightThemePrimary</item>
         <item name="colorPrimaryDark">@color/lightThemePrimaryDark</item>
-        <item name="colorAccent">@color/lightThemeAccent</item>
         <item name="daxLogoTextColor">@color/greyishBrownTwo</item>
         <item name="normalTextColor">@color/grayishBrown</item>
         <item name="toolbarIconColor">@color/grayishBrown</item>

From 9832d5d5ec48ae9a37e338ece066b605bc722072 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 28 Mar 2019 11:03:11 +0000
Subject: [PATCH 44/47] Fixing lint warnings

---
 .../app/feedback/ui/common/FeedbackViewModelTest.kt         | 1 -
 .../feedback/ui/negative/mainreason/MainReasonAdapter.kt    | 6 +++---
 .../app/feedback/ui/negative/subreason/SubReasonAdapter.kt  | 6 +++---
 app/src/main/res/values/strings.xml                         | 2 --
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
index 3fe629ca9057..f9c33c6f9c86 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -108,7 +108,6 @@ class FeedbackViewModelTest {
         assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
     }
 
-
     @Test
     fun whenUserChoosesNotToProvideFurtherDetailsForPositiveFeedbackThenSubmitted() = runBlocking<Unit> {
         withContext(Dispatchers.Main) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
index bc0a8f00bba7..44aaac1e31d1 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/mainreason/MainReasonAdapter.kt
@@ -31,12 +31,12 @@ import kotlinx.android.synthetic.main.item_feedback_reason.view.*
 class MainReasonAdapter(private val itemClickListener: (FeedbackTypeMainReasonDisplay) -> Unit) :
     ListAdapter<FeedbackTypeMainReasonDisplay, MainReasonAdapter.ViewHolder>(DiffCallback()) {
 
-    class DiffCallback<T> : DiffUtil.ItemCallback<T>() {
-        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
+    class DiffCallback : DiffUtil.ItemCallback<FeedbackTypeMainReasonDisplay>() {
+        override fun areItemsTheSame(oldItem: FeedbackTypeMainReasonDisplay, newItem: FeedbackTypeMainReasonDisplay): Boolean {
             return oldItem == newItem
         }
 
-        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean {
+        override fun areContentsTheSame(oldItem: FeedbackTypeMainReasonDisplay, newItem: FeedbackTypeMainReasonDisplay): Boolean {
             return oldItem == newItem
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
index 3bab0d1fd053..957b19aa7f8a 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/negative/subreason/SubReasonAdapter.kt
@@ -31,12 +31,12 @@ import kotlinx.android.synthetic.main.item_feedback_reason.view.*
 class SubReasonAdapter(private val itemClickListener: (FeedbackTypeSubReasonDisplay) -> Unit) :
     ListAdapter<FeedbackTypeSubReasonDisplay, SubReasonAdapter.ViewHolder>(DiffCallback()) {
 
-    class DiffCallback<T> : DiffUtil.ItemCallback<T>() {
-        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean {
+    class DiffCallback : DiffUtil.ItemCallback<FeedbackTypeSubReasonDisplay>() {
+        override fun areItemsTheSame(oldItem: FeedbackTypeSubReasonDisplay, newItem: FeedbackTypeSubReasonDisplay): Boolean {
             return oldItem == newItem
         }
 
-        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean {
+        override fun areContentsTheSame(oldItem: FeedbackTypeSubReasonDisplay, newItem: FeedbackTypeSubReasonDisplay): Boolean {
             return oldItem == newItem
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2feef0ebb063..4c0ba25cdb85 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -181,11 +181,9 @@
     <string name="brokenSiteReportBrokenSiteMenuItem">Report Broken Site</string>
     <string name="brokenSiteHeading">Report a Broken Site</string>
     <string name="brokenSiteModalDescription">Broken site reporting is completely anonymous and helps us improve the app!</string>
-    <string name="brokenSiteReportBrokenSite">Report a broken site</string>
     <string name="brokenSiteUrlHint">Enter URL</string>
     <string name="brokenSiteDomainLabel">Domain of broken site:</string>
     <string name="brokenSiteMessageHint">Which content or functionality is breaking?</string>
-    <string name="brokenSiteBrokenSiteHint">Which website content or functionality is breaking? Please be as specific as possible.</string>
     <string name="brokenSiteSubmitButton">Submit Feedback</string>
     <string name="brokenSiteSubmitted">Thank you! Feedback submitted</string>
 

From 2874ca26ec3996e52ae8ab6bb9af64a9f10242b4 Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:21:27 +0000
Subject: [PATCH 45/47] Dismiss keyboard when transitioning away from a
 keyboard-using fragment

---
 .../ui/common/FeedbackViewModelTest.kt        | 72 +++++++++---------
 .../feedback/ui/common/FeedbackActivity.kt    | 18 ++---
 .../feedback/ui/common/FeedbackViewModel.kt   | 76 +++++++++++--------
 3 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
index f9c33c6f9c86..3cb0128b2942 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModelTest.kt
@@ -47,8 +47,8 @@ class FeedbackViewModelTest {
     private val commandObserver: Observer<Command> = mock()
     private val commandCaptor = argumentCaptor<Command>()
 
-    private val fragmentViewState
-        get() = testee.viewState.value?.fragmentViewState
+    private val updateViewCommand
+        get() = testee.updateViewCommand.value?.fragmentViewState
 
     @Before
     @UiThreadTest
@@ -66,7 +66,7 @@ class FeedbackViewModelTest {
     @UiThreadTest
     @Test
     fun whenInitialisedThenFragmentStateIsForFirstStep() {
-        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+        assertTrue(updateViewCommand is InitialAppEnjoymentClarifier)
     }
 
     @Test
@@ -74,8 +74,8 @@ class FeedbackViewModelTest {
     fun whenCanRateAppAndUserSelectsInitialHappyFaceThenFragmentStateIsFirstStepOfHappyFlow() {
         configureRatingCanBeGiven()
         testee.userSelectedPositiveFeedback()
-        assertTrue(fragmentViewState is FragmentState.PositiveFeedbackFirstStep)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is FragmentState.PositiveFeedbackFirstStep)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -83,8 +83,8 @@ class FeedbackViewModelTest {
     fun whenCannotRateAppAndUserSelectsInitialHappyFaceThenFragmentStateSkipsStraightToSharingFeedback() {
         configureRatingCannotBeGiven()
         testee.userSelectedPositiveFeedback()
-        assertTrue(fragmentViewState is FragmentState.PositiveShareFeedback)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is FragmentState.PositiveShareFeedback)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -94,8 +94,8 @@ class FeedbackViewModelTest {
         testee.userSelectedPositiveFeedback()
         testee.onBackPressed()
 
-        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is InitialAppEnjoymentClarifier)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -105,7 +105,7 @@ class FeedbackViewModelTest {
         testee.userSelectedPositiveFeedback()
         testee.onBackPressed()
 
-        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
+        assertTrue(updateViewCommand is InitialAppEnjoymentClarifier)
     }
 
     @Test
@@ -182,8 +182,8 @@ class FeedbackViewModelTest {
     @UiThreadTest
     fun whenUserSelectsInitialSadFaceThenFragmentStateIsFirstStepOfUnhappyFlow() {
         testee.userSelectedNegativeFeedback()
-        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackMainReason)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -191,64 +191,64 @@ class FeedbackViewModelTest {
     fun whenUserNavigatesBackFromNegativeMainReasonFragmentThenFragmentStateIsInitialFragment() {
         testee.userSelectedNegativeFeedback()
         testee.onBackPressed()
-        assertTrue(fragmentViewState is InitialAppEnjoymentClarifier)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is InitialAppEnjoymentClarifier)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonMissingBrowserFeaturesThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonNotEnoughCustomizationsThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(NOT_ENOUGH_CUSTOMIZATIONS)
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonSearchNotGoodEnoughThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(SEARCH_NOT_GOOD_ENOUGH)
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonAppIsSlowOrBuggyThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(APP_IS_SLOW_OR_BUGGY)
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonOtherThenFragmentStateIsOpenEndedFeedback() {
         testee.userSelectedNegativeFeedbackMainReason(OTHER)
-        assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeOpenEndedFeedback)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsMainNegativeReasonBrokenSiteThenFragmentStateIsSubReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(WEBSITES_NOT_LOADING)
-        assertTrue(fragmentViewState is NegativeWebSitesBrokenFeedback)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeWebSitesBrokenFeedback)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
     @UiThreadTest
     fun whenUserSelectsSubNegativeReasonThenFragmentStateIsOpenEndedFeedback() {
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
-        assertTrue(fragmentViewState is NegativeOpenEndedFeedback)
-        verifyForwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeOpenEndedFeedback)
+        verifyForwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -256,8 +256,8 @@ class FeedbackViewModelTest {
     fun whenUserNavigatesBackFromSubReasonSelectionThenFragmentStateIsMainReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
         testee.onBackPressed()
-        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackMainReason)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -266,8 +266,8 @@ class FeedbackViewModelTest {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
         testee.onBackPressed()
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -275,8 +275,8 @@ class FeedbackViewModelTest {
     fun whenUserNavigatesBackFromOpenEndedFeedbackAndSubReasonNotAValidStepThenFragmentStateIsMainReasonSelection() {
         testee.userSelectedNegativeFeedbackMainReason(OTHER)
         testee.onBackPressed()
-        assertTrue(fragmentViewState is NegativeFeedbackMainReason)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackMainReason)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     @Test
@@ -285,8 +285,8 @@ class FeedbackViewModelTest {
         testee.userSelectedNegativeFeedbackMainReason(MISSING_BROWSING_FEATURES)
         testee.userSelectedSubReasonMissingBrowserFeatures(MISSING_BROWSING_FEATURES, TAB_MANAGEMENT)
         testee.onBackPressed()
-        assertTrue(fragmentViewState is NegativeFeedbackSubReason)
-        verifyBackwardsNavigation(fragmentViewState)
+        assertTrue(updateViewCommand is NegativeFeedbackSubReason)
+        verifyBackwardsNavigation(updateViewCommand)
     }
 
     private fun verifyForwardsNavigation(fragmentViewState: FragmentState?) {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index d99b6e048f21..ac17768863a9 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -33,6 +33,7 @@ import com.duckduckgo.app.feedback.ui.negative.openended.ShareOpenEndedFeedbackF
 import com.duckduckgo.app.feedback.ui.negative.subreason.SubReasonNegativeFeedbackFragment
 import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFragment
 import com.duckduckgo.app.global.DuckDuckGoActivity
+import com.duckduckgo.app.global.view.hideKeyboard
 import kotlinx.android.synthetic.main.include_toolbar.*
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -65,7 +66,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
         viewModel.command.observe(this, Observer {
             it?.let { command -> processCommand(command) }
         })
-        viewModel.viewState.observe(this, Observer<ViewState> {
+        viewModel.updateViewCommand.observe(this, Observer {
             it?.let { viewState -> render(viewState) }
         })
     }
@@ -74,13 +75,12 @@ class FeedbackActivity : DuckDuckGoActivity(),
         Timber.v("Processing command: $command")
 
         when (command) {
-            is Command.Exit -> {
-                animateFinish(command.feedbackSubmitted)
-            }
+            is Command.Exit -> animateFinish(command.feedbackSubmitted)
+            is Command.HideKeyboard -> hideKeyboard()
         }
     }
 
-    private fun render(viewState: ViewState) {
+    private fun render(viewState: UpdateViewCommand) {
         Timber.v("ViewState is: $viewState")
 
         val state = viewState.fragmentViewState
@@ -178,7 +178,6 @@ class FeedbackActivity : DuckDuckGoActivity(),
         GlobalScope.launch { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
     }
 
-
     /**
      * Negative feedback listeners
      */
@@ -193,7 +192,6 @@ class FeedbackActivity : DuckDuckGoActivity(),
         viewModel.userSelectedNegativeFeedbackMainReason(type)
     }
 
-
     /**
      * Negative feedback subReason selection
      */
@@ -221,12 +219,14 @@ class FeedbackActivity : DuckDuckGoActivity(),
         GlobalScope.launch { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
     }
 
-    companion object {
+    private fun hideKeyboard() {
+        toolbar?.hideKeyboard()
+    }
 
+    companion object {
         fun intent(context: Context): Intent {
             return Intent(context, FeedbackActivity::class.java)
         }
-
     }
 }
 
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 008e2c479c80..6462c5cff28b 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -16,10 +16,10 @@
 
 package com.duckduckgo.app.feedback.ui.common
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.feedback.api.FeedbackSubmitter
+import com.duckduckgo.app.feedback.ui.common.Command.Exit
 import com.duckduckgo.app.feedback.ui.common.FragmentState.*
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType
 import com.duckduckgo.app.feedback.ui.negative.FeedbackType.MainReason
@@ -35,16 +35,15 @@ import timber.log.Timber
 
 class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val feedbackSubmitter: FeedbackSubmitter) : ViewModel() {
 
-    val viewState: MutableLiveData<ViewState> = MutableLiveData()
+    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+    val updateViewCommand: SingleLiveEvent<UpdateViewCommand> = SingleLiveEvent()
 
     init {
-        viewState.postValue(ViewState(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS)))
+        updateViewCommand.postValue(UpdateViewCommand(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_FORWARDS)))
     }
 
-    private val currentViewState: ViewState
-        get() = viewState.value!!
-
-    val command: SingleLiveEvent<Command> = SingleLiveEvent()
+    private val currentViewState: UpdateViewCommand
+        get() = updateViewCommand.value!!
 
 
     fun userSelectedNegativeFeedbackMainReason(mainReason: MainReason) {
@@ -56,7 +55,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
             MainReason.APP_IS_SLOW_OR_BUGGY -> NegativeFeedbackSubReason(NAVIGATION_FORWARDS, mainReason)
             MainReason.OTHER -> NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason)
         }
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = newState,
             mainReason = mainReason,
             subReason = null,
@@ -65,30 +64,34 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     fun onBackPressed() {
+        var shouldHideKeyboard = false
         when (currentViewState.fragmentViewState) {
             is InitialAppEnjoymentClarifier -> {
-                command.value = Command.Exit(feedbackSubmitted = false)
+                command.value = Exit(feedbackSubmitted = false)
             }
             is PositiveFeedbackFirstStep -> {
-                viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+                updateViewCommand.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
             }
             is PositiveShareFeedback -> {
+                shouldHideKeyboard = true
                 if (canShowRatingsButton()) {
-                    viewState.value = currentViewState.copy(fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_BACKWARDS))
+                    updateViewCommand.value = currentViewState.copy(fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_BACKWARDS))
                 } else {
-                    viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+                    updateViewCommand.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
                 }
             }
             is NegativeFeedbackMainReason -> {
-                viewState.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
+                updateViewCommand.value = currentViewState.copy(fragmentViewState = InitialAppEnjoymentClarifier(NAVIGATION_BACKWARDS))
             }
             is NegativeFeedbackSubReason -> {
-                viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
+                updateViewCommand.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
             }
             is NegativeWebSitesBrokenFeedback -> {
-                viewState.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
+                shouldHideKeyboard = true
+                updateViewCommand.value = currentViewState.copy(fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_BACKWARDS))
             }
             is NegativeOpenEndedFeedback -> {
+                shouldHideKeyboard = true
                 val newViewState = when (currentViewState.previousViewState) {
                     is NegativeFeedbackSubReason -> {
                         NegativeFeedbackSubReason(NAVIGATION_BACKWARDS, currentViewState.mainReason!!)
@@ -100,13 +103,17 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
                         NegativeFeedbackMainReason(NAVIGATION_BACKWARDS)
                     }
                 }
-                viewState.value = currentViewState.copy(fragmentViewState = newViewState)
+                updateViewCommand.value = currentViewState.copy(fragmentViewState = newViewState)
             }
         }
+
+        if (shouldHideKeyboard) {
+            command.value = Command.HideKeyboard
+        }
     }
 
     fun userSelectedPositiveFeedback() {
-        viewState.value = if (canShowRatingsButton()) {
+        updateViewCommand.value = if (canShowRatingsButton()) {
             currentViewState.copy(
                 fragmentViewState = PositiveFeedbackFirstStep(NAVIGATION_FORWARDS),
                 previousViewState = currentViewState.fragmentViewState
@@ -139,47 +146,46 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     fun userSelectedNegativeFeedback() {
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = NegativeFeedbackMainReason(NAVIGATION_FORWARDS),
             previousViewState = currentViewState.fragmentViewState
         )
     }
 
     fun userWantsToCancel() {
-        Timber.i("User is cancelling")
-        command.value = Command.Exit(feedbackSubmitted = false)
+        command.value = Exit(feedbackSubmitted = false)
     }
 
     fun userSelectedToGiveFeedback() {
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = PositiveShareFeedback(NAVIGATION_FORWARDS),
             previousViewState = currentViewState.fragmentViewState
         )
     }
 
     suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        command.postValue(Command.Exit(feedbackSubmitted = true))
+        command.postValue(Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
     }
 
     suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-        command.postValue(Command.Exit(feedbackSubmitted = true))
+        command.postValue(Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
     }
 
     suspend fun userGavePositiveFeedbackNoDetails() {
-        command.postValue(Command.Exit(feedbackSubmitted = true))
+        command.postValue(Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
     }
 
     suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        command.postValue(Command.Exit(feedbackSubmitted = true))
+        command.postValue(Exit(feedbackSubmitted = true))
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
@@ -187,7 +193,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedSubReasonMissingBrowserFeatures(mainReason: MainReason, subReason: FeedbackType.MissingBrowserFeaturesSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = newState,
             mainReason = mainReason,
             subReason = subReason,
@@ -197,7 +203,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedSubReasonSearchNotGoodEnough(mainReason: MainReason, subReason: FeedbackType.SearchNotGoodEnoughSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = newState,
             mainReason = mainReason,
             subReason = subReason,
@@ -207,7 +213,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedSubReasonNeedMoreCustomization(mainReason: MainReason, subReason: FeedbackType.CustomizationSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = newState,
             mainReason = mainReason,
             subReason = subReason,
@@ -217,7 +223,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
 
     fun userSelectedSubReasonAppIsSlowOrBuggy(mainReason: MainReason, subReason: FeedbackType.PerformanceSubReasons) {
         val newState = NegativeOpenEndedFeedback(NAVIGATION_FORWARDS, mainReason, subReason)
-        viewState.value = currentViewState.copy(
+        updateViewCommand.value = currentViewState.copy(
             fragmentViewState = newState,
             mainReason = mainReason,
             subReason = subReason,
@@ -226,7 +232,7 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userSelectedToRateApp() {
-        command.postValue(Command.Exit(feedbackSubmitted = true))
+        command.postValue(Exit(feedbackSubmitted = true))
         GlobalScope.launch(Dispatchers.IO) {
             feedbackSubmitter.sendUserRated()
         }
@@ -269,4 +275,12 @@ sealed class FragmentState(open val forwardDirection: Boolean) {
 
 sealed class Command {
     data class Exit(val feedbackSubmitted: Boolean) : Command()
-}
\ No newline at end of file
+    object HideKeyboard : Command()
+}
+
+data class UpdateViewCommand(
+    val fragmentViewState: FragmentState,
+    val previousViewState: FragmentState? = null,
+    val mainReason: MainReason? = null,
+    val subReason: SubReason? = null
+)
\ No newline at end of file

From 000a8996139578f6477e2e8bf472e04dbbe880dd Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:50:56 +0000
Subject: [PATCH 46/47] Switch from postValue to set value to try fix flakey
 test

---
 .../feedback/ui/common/FeedbackViewModel.kt   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index 6462c5cff28b..bdf5048bfdc7 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -164,28 +164,36 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        command.postValue(Exit(feedbackSubmitted = true))
+        withContext(Dispatchers.Main) {
+            command.value = Exit(feedbackSubmitted = true)
+        }
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
     }
 
     suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-        command.postValue(Exit(feedbackSubmitted = true))
+        withContext(Dispatchers.Main) {
+            command.value = Exit(feedbackSubmitted = true)
+        }
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
     }
 
     suspend fun userGavePositiveFeedbackNoDetails() {
-        command.postValue(Exit(feedbackSubmitted = true))
+        withContext(Dispatchers.Main) {
+            command.value = Exit(feedbackSubmitted = true)
+        }
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
     }
 
     suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        command.postValue(Exit(feedbackSubmitted = true))
+        withContext(Dispatchers.Main) {
+            command.value = Exit(feedbackSubmitted = true)
+        }
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
@@ -232,7 +240,9 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userSelectedToRateApp() {
-        command.postValue(Exit(feedbackSubmitted = true))
+        withContext(Dispatchers.Main) {
+            command.value = Exit(feedbackSubmitted = true)
+        }
         GlobalScope.launch(Dispatchers.IO) {
             feedbackSubmitter.sendUserRated()
         }

From 9af7afe8ebad2cb8acc287b2e93dba8826dfb44c Mon Sep 17 00:00:00 2001
From: Craig Russell <CDRussell@users.noreply.github.com>
Date: Thu, 28 Mar 2019 13:07:45 +0000
Subject: [PATCH 47/47] Ensure UI methods are called from the Main thread

---
 .../feedback/ui/common/FeedbackActivity.kt    | 11 ++++---
 .../feedback/ui/common/FeedbackViewModel.kt   | 32 +++++++------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
index ac17768863a9..3e994cfe1d54 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackActivity.kt
@@ -35,6 +35,7 @@ import com.duckduckgo.app.feedback.ui.positive.initial.PositiveFeedbackLandingFr
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.view.hideKeyboard
 import kotlinx.android.synthetic.main.include_toolbar.*
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
@@ -163,7 +164,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Positive feedback listeners
      */
     override fun userSelectedToRateApp() {
-        GlobalScope.launch { viewModel.userSelectedToRateApp() }
+        GlobalScope.launch(Dispatchers.Main) { viewModel.userSelectedToRateApp() }
     }
 
     override fun userSelectedToGiveFeedback() {
@@ -171,18 +172,18 @@ class FeedbackActivity : DuckDuckGoActivity(),
     }
 
     override fun userGavePositiveFeedbackNoDetails() {
-        GlobalScope.launch { viewModel.userGavePositiveFeedbackNoDetails() }
+        GlobalScope.launch(Dispatchers.Main) { viewModel.userGavePositiveFeedbackNoDetails() }
     }
 
     override fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        GlobalScope.launch { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
+        GlobalScope.launch(Dispatchers.Main) { viewModel.userProvidedPositiveOpenEndedFeedback(feedback) }
     }
 
     /**
      * Negative feedback listeners
      */
     override fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        GlobalScope.launch { viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback) }
+        GlobalScope.launch(Dispatchers.Main) { viewModel.userProvidedNegativeOpenEndedFeedback(mainReason, subReason, feedback) }
     }
 
     /**
@@ -216,7 +217,7 @@ class FeedbackActivity : DuckDuckGoActivity(),
      * Negative feedback, broken site
      */
     override fun onProvidedBrokenSiteFeedback(feedback: String, url: String?) {
-        GlobalScope.launch { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
+        GlobalScope.launch(Dispatchers.Main) { viewModel.onProvidedBrokenSiteFeedback(feedback, url) }
     }
 
     private fun hideKeyboard() {
diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
index bdf5048bfdc7..3e8cbf753687 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/common/FeedbackViewModel.kt
@@ -164,36 +164,35 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
     }
 
     suspend fun userProvidedNegativeOpenEndedFeedback(mainReason: MainReason, subReason: SubReason?, feedback: String) {
-        withContext(Dispatchers.Main) {
-            command.value = Exit(feedbackSubmitted = true)
-        }
+        command.value = Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendNegativeFeedback(mainReason, subReason, feedback)
         }
     }
 
     suspend fun onProvidedBrokenSiteFeedback(feedback: String, brokenSite: String?) {
-        withContext(Dispatchers.Main) {
-            command.value = Exit(feedbackSubmitted = true)
-        }
+        command.value = Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendBrokenSiteFeedback(feedback, brokenSite)
         }
     }
 
     suspend fun userGavePositiveFeedbackNoDetails() {
-        withContext(Dispatchers.Main) {
-            command.value = Exit(feedbackSubmitted = true)
-        }
+        command.value = Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(null)
         }
     }
 
-    suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
-        withContext(Dispatchers.Main) {
-            command.value = Exit(feedbackSubmitted = true)
+    suspend fun userSelectedToRateApp() {
+        command.value = Exit(feedbackSubmitted = true)
+        GlobalScope.launch(Dispatchers.IO) {
+            feedbackSubmitter.sendUserRated()
         }
+    }
+
+    suspend fun userProvidedPositiveOpenEndedFeedback(feedback: String) {
+        command.value = Exit(feedbackSubmitted = true)
         withContext(Dispatchers.IO) {
             feedbackSubmitter.sendPositiveFeedback(feedback)
         }
@@ -239,15 +238,6 @@ class FeedbackViewModel(private val playStoreUtils: PlayStoreUtils, private val
         )
     }
 
-    suspend fun userSelectedToRateApp() {
-        withContext(Dispatchers.Main) {
-            command.value = Exit(feedbackSubmitted = true)
-        }
-        GlobalScope.launch(Dispatchers.IO) {
-            feedbackSubmitter.sendUserRated()
-        }
-    }
-
     companion object {
         const val NAVIGATION_FORWARDS = true
         const val NAVIGATION_BACKWARDS = false