VPN-4687: Add DNS settings help sheet

nebula/ui/components/MZHelpSheet.qml

@@ -23,7 +23,6 @@ import Mozilla.Shared 1.0
 /*
   MZHelpSheet {
       title: "MZHelpSheet"
-      iconSource: "qrc:/ui/resources/connection-info-dark.svg"
 
       model: [
           {type: MZHelpSheet.BlockType.Title, text: "title"},
@@ -39,7 +38,6 @@ import Mozilla.Shared 1.0
 MZBottomSheet {
     id: bottomSheet
 
-    property alias iconSource: icon.source
     property alias title: title.text
     required property var model
 
@@ -65,6 +63,7 @@ MZBottomSheet {
             id: headerLayout
 
             Layout.topMargin: 8
+            Layout.preferredWidth: parent.width
 
             spacing: 0
 
@@ -82,7 +81,8 @@ MZBottomSheet {
                         id: icon
                         anchors.centerIn: parent
 
-                        sourceSize.width: MZTheme.theme.iconSize
+                        source: "qrc:/nebula/resources/tip-filled.svg"
+                        sourceSize.width: MZTheme.theme.iconSize * 1.5
 
                         mirror: MZLocalizer.isRightToLeft
                         fillMode: Image.PreserveAspectFit
@@ -96,24 +96,31 @@ MZBottomSheet {
                     Layout.topMargin: MZTheme.theme.windowMargin / 2
                     Layout.leftMargin: 8
                     Layout.alignment: Qt.AlignTop
+                    Layout.fillWidth: true
 
                     verticalAlignment: Text.AlignVCenter
                     lineHeightMode: Text.FixedHeight
                     lineHeight: 24
+                    elide: Text.ElideRight
                 }
 
                 Item {
                     Layout.fillWidth: true
                 }
 
                 MZIconButton {
-                    id: iconButton
-
                     Layout.rightMargin: MZTheme.theme.windowMargin / 2
 
                     Layout.preferredHeight: MZTheme.theme.rowHeight
                     Layout.preferredWidth: MZTheme.theme.rowHeight
 
+                    //Hacky workaround because for some reason, when opening a sheet via
+                    //the right menu button in MZMenu, this close button is in a
+                    //"Hovered" state, even though it wasn't hovered
+                    //Likely something to do with both icon buttons being in the same position
+                    //Relative to their parent (top right corner)
+                    mouseArea.hoverEnabled: bottomSheet.opened
+
                     onClicked: bottomSheet.close()
 
                     accessibleName: MZI18n.GlobalClose
@@ -133,7 +140,7 @@ MZBottomSheet {
             Rectangle {
                 Layout.topMargin: 8
                 Layout.preferredHeight: MZTheme.theme.dividerHeight
-                Layout.preferredWidth: parent.width
+                Layout.fillWidth: true
 
                 color: MZTheme.colors.grey10
             }

nebula/ui/components/MZIconButton.qml

@@ -12,6 +12,7 @@ MZButtonBase {
     property bool skipEnsureVisible: false
     property var accessibleName
     property var buttonColorScheme: MZTheme.theme.iconButtonLightBackground
+    property alias mouseArea: mouseArea
     property alias backgroundRadius: uiStates.radius
     property alias uiStatesVisible: uiStates.visible
 

nebula/ui/components/MZMenu.qml

@@ -103,10 +103,11 @@ Item {
 
         sourceComponent: menuBar.rightButtonComponent
         onItemChanged: {
-            if (item instanceof Text) {
+            //item.item is for right button components that might be inside a loder itself
+            if (item instanceof Text || item.item instanceof Text) {
                 anchors.rightMargin = MZTheme.theme.windowMargin
             }
-            else if(item instanceof MZIconButton) {
+            else if(item instanceof MZIconButton || item.item instanceof MZIconButton) {
                 anchors.rightMargin = MZTheme.theme.windowMargin / 2
             }
         }

nebula/ui/resources/CMakeLists.txt

@@ -71,5 +71,7 @@ qt_add_qml_module(resources
         info.svg
         lock.svg
         startup.svg
+        question.svg
+        tip-filled.svg
 
 )

src/feature/featurelist.h

@@ -89,6 +89,13 @@ FEATURE(gleanRust,             // Feature ID
         QStringList(),         // feature dependencies
         FeatureCallback_true)
 
+FEATURE(helpSheets,            // Feature ID
+        "Help sheets",         // Feature name
+        FeatureCallback_true,  // Can be flipped on
+        FeatureCallback_true,  // Can be flipped off
+        QStringList(),         // feature dependencies
+        FeatureCallback_false)
+
 FEATURE(inAppAccountCreate,                  // Feature ID
         "In-app Account Creation",           // Feature name
         FeatureCallback_true,                // Can be flipped on

src/mozillavpn.cpp

@@ -1381,6 +1381,11 @@ void MozillaVPN::registerUrlOpenerLabels() {
   uo->registerUrlLabel("upgradeToAnnualUrl", []() -> QString {
     return Constants::upgradeToAnnualUrl();
   });
+
+  uo->registerUrlLabel("sumoDns", []() -> QString {
+    return "https://support.mozilla.org/en-US/kb/"
+           "how-do-i-change-my-dns-settings";
+  });
 }
 
 void MozillaVPN::errorHandled() {

src/translations/strings.yaml

@@ -928,6 +928,20 @@ devices:
     value: My devices
     comment: Title for the menu bar when viewing the devices or device limit pages
 
+helpSheets: 
+  dnsTitle:
+    value: Custom DNS settings
+    comment: Title label for the custom dns help sheet
+  dnsHeader: 
+    value: What is custom DNS?
+    comment: Header label for the custom dns help sheet
+  dnsBody1:
+    value: Whenever you connect to a website, a DNS (domain name system) first turns the domain name (e.g. www.mozilla.org) into an IP address that allows your internet traffic to reach that destination.
+    comment: Body text for the custom dns help sheet
+  dnsBody2:
+    value: Mozilla VPN allows you to choose a custom DNS server if you prefer. If you use one, you won’t be able to use other privacy features in the VPN like tracker blocking.
+    comment: Body text for the custom dns help sheet
+
 global:
   expand:
     value: Expand
@@ -977,6 +991,12 @@ global:
   getStarted:
     value: Get started
     comment: Label for a button used to begin something / proceed
+  help:
+    value: Help
+    comment: Action taken that will help the user
+  learnMore:
+    value: Learn more
+    comment: Label for link to allow the user to learn more about a topic
 
 getHelp:
   helpCenter: Help Center

src/ui/screens/settings/ViewDNSSettings.qml

@@ -21,6 +21,25 @@ MZViewBase {
     property bool privacyDialogNeeded: true
     property bool dnsSelectionChanged: false
     readonly property string telemetryScreenId : "dns_settings"
+    property Component rightMenuButton: Component {
+        Loader {
+            active: MZFeatureList.get("helpSheets").isSupported
+            sourceComponent: MZIconButton {
+                onClicked: helpSheetLoader.active = true
+
+                accessibleName: MZI18n.GlobalHelp
+                Accessible.ignored: !visible
+
+                Image {
+                    anchors.centerIn: parent
+
+                    source: "qrc:/nebula/resources/question.svg"
+                    fillMode: Image.PreserveAspectFit
+                }
+            }
+        }
+    }
+
 
     function applyFrontendChanges(settingValue) {
         if (settingValue === MZSettings.Gateway) {
@@ -73,7 +92,7 @@ MZViewBase {
     function reset() {
         root.customDNS = MZSettings.dnsProviderFlags === MZSettings.Custom;
         root.privacyDialogNeeded = MZSettings.dnsProviderFlags !== MZSettings.Custom &&
-                                   MZSettings.dnsProviderFlags !== MZSettings.Gateway;
+                MZSettings.dnsProviderFlags !== MZSettings.Gateway;
         ipInput.text = MZSettings.userDNS;
     }
 
@@ -224,9 +243,9 @@ MZViewBase {
                     }
 
                     onActiveFocusChanged: {
-                       if (!activeFocus && !ipInput.focusReasonA11y) {
-                           maybeSaveChange();
-                       }
+                        if (!activeFocus && !ipInput.focusReasonA11y) {
+                            maybeSaveChange();
+                        }
                     }
                 }
 
@@ -258,8 +277,8 @@ MZViewBase {
 
     Component.onCompleted: {
         Glean.impression.dnsSettingsScreen.record({
-        screen: telemetryScreenId,
-        });
+                                                      screen: telemetryScreenId,
+                                                  });
         reset();
     }
 
@@ -268,11 +287,11 @@ MZViewBase {
     }
 
     onVisibleChanged: {
-      if (!visible) {
-          maybeSaveChange();
-      } else {
-          reset();
-      }
+        if (!visible) {
+            maybeSaveChange();
+        } else {
+            reset();
+        }
     }
 
     Loader {
@@ -315,5 +334,26 @@ MZViewBase {
 
         onActiveChanged: if (active) { item.open() }
     }
+
+    Loader {
+        id: helpSheetLoader
+
+        active: false
+
+        onActiveChanged: if (active) item.open()
+
+        sourceComponent: MZHelpSheet {
+            title: MZI18n.HelpSheetsDnsTitle
+
+            model: [
+                {type: MZHelpSheet.BlockType.Title, text: MZI18n.HelpSheetsDnsHeader},
+                {type: MZHelpSheet.BlockType.Text, text: MZI18n.HelpSheetsDnsBody1, margin: 8},
+                {type: MZHelpSheet.BlockType.Text, text:MZI18n.HelpSheetsDnsBody2, margin: 16},
+                {type: MZHelpSheet.BlockType.LinkButton, text: MZI18n.GlobalLearnMore, margin: 16, action: () => { MZUrlOpener.openUrlLabel("sumoDns") } },
+            ]
+
+            onClosed: helpSheetLoader.active = false
+        }
+    }
 }