Feedback disambiguation

Core/Pixel.swift

@@ -83,7 +83,40 @@ public enum PixelName: String {
     case tabBarForwardPressed = "mt_fw"
     case tabBarBookmarksPressed = "mt_bm"
     case tabBarTabSwitcherPressed = "mt_tb"
-
+
+    case feedbackPositive = "mfbs_positive_submit"
+    case feedbackNegativePrefix = "mfbs_negative_"
+
+    case feedbackNegativeBrokenSites = "mfbs_negative_brokenSites_submit"
+    case feedbackNegativeOther = "mfbs_negative_other_submit"
+
+    case feedbackNegativeBrowserFeaturesNav = "mfbs_negative_browserFeatures_navigation"
+    case feedbackNegativeBrowserFeaturesTabs = "mfbs_negative_browserFeatures_tabs"
+    case feedbackNegativeBrowserFeaturesAds = "mfbs_negative_browserFeatures_ads"
+    case feedbackNegativeBrowserFeaturesVideos = "mfbs_negative_browserFeatures_videos"
+    case feedbackNegativeBrowserFeaturesImages = "mfbs_negative_browserFeatures_images"
+    case feedbackNegativeBrowserFeaturesBookmarks = "mfbs_negative_browserFeatures_bookmarks"
+    case feedbackNegativeBrowserFeaturesOther = "mfbs_negative_browserFeatures_other"
+
+    case feedbackNegativeBadResultsTechnical = "mfbs_negative_badResults_technical"
+    case feedbackNegativeBadResultsLayout = "mfbs_negative_badResults_layout"
+    case feedbackNegativeBadResultsSpeed = "mfbs_negative_badResults_speed"
+    case feedbackNegativeBadResultsLangOrRegion = "mfbs_negative_badResults_langRegion"
+    case feedbackNegativeBadResultsAutocomplete = "mfbs_negative_badResults_autocomplete"
+    case feedbackNegativeBadResultsOther = "mfbs_negative_badResults_other"
+
+    case feedbackNegativeCustomizationHome = "mfbs_negative_customization_home"
+    case feedbackNegativeCustomizationTabs = "mfbs_negative_customization_tabs"
+    case feedbackNegativeCustomizationUI = "mfbs_negative_customization_ui"
+    case feedbackNegativeCustomizationWhatCleared = "mfbs_negative_customization_whichDataCleared"
+    case feedbackNegativeCustomizationWhenCleared = "mfbs_negative_customization_whenDataCleared"
+    case feedbackNegativeCustomizationBookmarks = "mfbs_negative_customization_bookmarks"
+    case feedbackNegativeCustomizationOther = "mfbs_negative_customization_other"
+
+    case feedbackNegativePerformanceSlow = "mfbs_negative_performance_slow"
+    case feedbackNegativePerformanceCrash = "mfbs_negative_performance_crash"
+    case feedbackNegativePerformanceVideo = "mfbs_negative_performance_video"
+    case feedbackNegativePerformanceOther = "mfbs_negative_performance_other"
 }
 
 public class Pixel {
@@ -113,7 +146,6 @@ public class Pixel {
                             withAdditionalParameters params: [String: String?] = [:],
                             withHeaders headers: HTTPHeaders = APIHeaders().defaultHeaders,
                             onComplete: @escaping (Error?) -> Void = {_ in }) {
-
         let formFactor = deviceType == .pad ? Constants.tablet : Constants.phone
         let url = appUrls
             .pixelUrl(forPixelNamed: pixel.rawValue, formFactor: formFactor)

DuckDuckGo/Assets.xcassets/Remove.imageset/Contents.json

@@ -8,5 +8,8 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

DuckDuckGo/Assets.xcassets/ReportIcon.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "iconReport.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

DuckDuckGo/AutoClearSettingsViewController.swift

@@ -142,7 +142,7 @@ class AutoClearSettingsViewController: UITableViewController {
         cell.backgroundColor = theme.tableCellBackgroundColor
 
         // Checkmark color
-        cell.tintColor = theme.toggleSwitchColor
+        cell.tintColor = theme.buttonTintColor
 
         if let settings = clearDataSettings,
             indexPathOf(action: settings.action) == indexPath || indexPathOf(timing: settings.timing) == indexPath {
@@ -185,7 +185,7 @@ extension AutoClearSettingsViewController: Themable {
             label.textColor = theme.tableCellTintColor
         }
 
-        clearDataToggle.onTintColor = theme.toggleSwitchColor
+        clearDataToggle.onTintColor = theme.buttonTintColor
 
         tableView.backgroundColor = theme.backgroundColor
         tableView.separatorColor = theme.tableCellSeparatorColor

DuckDuckGo/DarkTheme.swift

@@ -46,7 +46,11 @@ struct DarkTheme: Theme {
     var tableCellAccessoryTextColor = UIColor.greyish
     var tableHeaderTextColor = UIColor.lightGreyish
 
-    var toggleSwitchColor = UIColor.cornflowerBlue
+    var buttonTintColor = UIColor.cornflowerBlue
+    var placeholderColor = UIColor.greyish
+
+    var textFieldBackgroundColor = UIColor.nearlyBlackLight
+    var textFieldFontColor = UIColor.white
 
     var homeRowPrimaryTextColor = UIColor.white
     var homeRowSecondaryTextColor = UIColor.lightMercury
@@ -61,5 +65,9 @@ struct DarkTheme: Theme {
     var faviconBackgroundColor = UIColor.charcoalGrey
     var favoriteTextColor = UIColor.greyish
 
+    var feedbackPrimaryTextColor = UIColor.white
+    var feedbackSecondaryTextColor = UIColor.lightGreyish
+    var feedbackSentimentButtonBackgroundColor = UIColor.charcoalGrey
+
     var activityStyle: UIActivityIndicatorView.Style = .white
 }