Waitlist for WD (duckduckgo#2831)

Task/Issue URL: https://app.asana.com/0/0/1202843599939263/f 

### Description
Adds a new waitlist in settings. Similar to the one we had for macOS.


### Steps to test this PR
Follow instructions in https://app.asana.com/0/0/1203975737540623/f

### UI changes
| Before  | After |
| ------ | ----- |
!(Upload before screenshot)|(Upload after screenshot)|

Co-authored-by: Marcos <marcosh@duckduckgo.com>

Author: 2 people

app/build.gradle

@@ -256,6 +256,10 @@ dependencies {
     implementation project(':request-filterer-impl')
     implementation project(':request-filterer-store')
 
+    implementation project(':windows-api')
+    implementation project(':windows-impl')
+    implementation project(':windows-store')
+
     // Deprecated. TODO: Stop using this artifact.
     implementation "androidx.legacy:legacy-support-v4:_"
     debugImplementation Square.leakCanary.android

app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt

@@ -29,6 +29,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
@@ -79,6 +80,11 @@ import com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
 import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.VpnOnboardingActivity
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivity
+import com.duckduckgo.windows.api.WindowsWaitlistState
+import com.duckduckgo.windows.api.WindowsWaitlistState.InBeta
+import com.duckduckgo.windows.api.WindowsWaitlistState.JoinedWaitlist
+import com.duckduckgo.windows.api.WindowsWaitlistState.NotJoinedQueue
+import com.duckduckgo.windows.impl.waitlist.ui.WindowsWaitlistActivity
 import javax.inject.Inject
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -207,6 +213,7 @@ class SettingsActivity : DuckDuckGoActivity() {
             emailSetting.setClickListener { viewModel.onEmailProtectionSettingClicked() }
             macOsSetting.setClickListener { viewModel.onMacOsSettingClicked() }
             vpnSetting.setClickListener { viewModel.onAppTPSettingClicked() }
+            windowsSetting.setClickListener { viewModel.windowsSettingClicked() }
         }
     }
 
@@ -250,6 +257,7 @@ class SettingsActivity : DuckDuckGoActivity() {
                     )
                     updateEmailSubtitle(it.emailAddress)
                     updateAutofill(it.showAutofill)
+                    updateWindowsSettings(it.windowsWaitlistState)
                     viewsCustomize.notificationsSetting.setSecondaryText(getString(it.notificationsSettingSubtitleId))
                 }
             }.launchIn(lifecycleScope)
@@ -268,6 +276,19 @@ class SettingsActivity : DuckDuckGoActivity() {
         }
     }
 
+    private fun updateWindowsSettings(waitlistState: WindowsWaitlistState?) {
+        viewsMore.windowsSetting.isVisible = waitlistState != null
+
+        with(viewsMore) {
+            when (waitlistState) {
+                is InBeta -> windowsSetting.setSecondaryText(getString(R.string.windows_settings_description_ready))
+                is JoinedWaitlist -> windowsSetting.setSecondaryText(getString(R.string.windows_settings_description_list))
+                is NotJoinedQueue -> windowsSetting.setSecondaryText(getString(R.string.windows_settings_description))
+                null -> {}
+            }
+        }
+    }
+
     private fun updateEmailSubtitle(emailAddress: String?) {
         val subtitle = emailAddress ?: getString(R.string.settingsEmailProtectionSubtitle)
         viewsMore.emailSetting.setSecondaryText(subtitle)
@@ -410,6 +431,7 @@ class SettingsActivity : DuckDuckGoActivity() {
             is Command.LaunchMacOs -> launchMacOsScreen()
             is Command.LaunchAutoconsent -> launchAutoconsent()
             is Command.LaunchNotificationsSettings -> launchNotificationsSettings()
+            is Command.LaunchWindows -> launchWindowsScreen()
             null -> TODO()
         }
     }
@@ -596,6 +618,11 @@ class SettingsActivity : DuckDuckGoActivity() {
         startActivity(MacOsActivity.intent(this), options)
     }
 
+    private fun launchWindowsScreen() {
+        val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
+        startActivity(WindowsWaitlistActivity.intent(this), options)
+    }
+
     private fun launchAutoconsent() {
         val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle()
         startActivity(AutoconsentSettingsActivity.intent(this), options)

app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt

@@ -50,6 +50,9 @@ import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.VpnStore
 import com.duckduckgo.privacy.config.api.Gpc
 import com.duckduckgo.privacy.config.api.PrivacyFeatureName
+import com.duckduckgo.windows.api.WindowsWaitlist
+import com.duckduckgo.windows.api.WindowsWaitlistFeature
+import com.duckduckgo.windows.api.WindowsWaitlistState
 import javax.inject.Inject
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.BufferOverflow
@@ -79,6 +82,8 @@ class SettingsViewModel @Inject constructor(
     private val autofillCapabilityChecker: AutofillCapabilityChecker,
     private val vpnFeaturesRegistry: VpnFeaturesRegistry,
     private val autoconsent: Autoconsent,
+    private val windowsWaitlist: WindowsWaitlist,
+    private val windowsFeature: WindowsWaitlistFeature,
 ) : ViewModel(), DefaultLifecycleObserver {
 
     private var deviceShieldStatePollingJob: Job? = null
@@ -101,6 +106,7 @@ class SettingsViewModel @Inject constructor(
         val showAutofill: Boolean = false,
         val autoconsentEnabled: Boolean = false,
         @StringRes val notificationsSettingSubtitleId: Int = R.string.settingsSubtitleNotificationsDisabled,
+        val windowsWaitlistState: WindowsWaitlistState? = null,
     )
 
     data class AutomaticallyClearData(
@@ -133,6 +139,7 @@ class SettingsViewModel @Inject constructor(
         data class ShowClearWhenDialog(val option: ClearWhenOption) : Command()
         object LaunchMacOs : Command()
         object LaunchNotificationsSettings : Command()
+        object LaunchWindows : Command()
     }
 
     private val viewState = MutableStateFlow(ViewState())
@@ -171,6 +178,7 @@ class SettingsViewModel @Inject constructor(
                     showAutofill = autofillCapabilityChecker.canAccessCredentialManagementScreen(),
                     autoconsentEnabled = autoconsent.isSettingEnabled(),
                     notificationsSettingSubtitleId = getNotificationsSettingSubtitleId(notificationsEnabled),
+                    windowsWaitlistState = windowsSettingState(),
                 ),
             )
         }
@@ -287,6 +295,10 @@ class SettingsViewModel @Inject constructor(
         viewModelScope.launch { command.send(Command.LaunchMacOs) }
     }
 
+    fun windowsSettingClicked() {
+        viewModelScope.launch { command.send(Command.LaunchWindows) }
+    }
+
     fun onDefaultBrowserToggled(enabled: Boolean) {
         Timber.i("User toggled default browser, is now enabled: $enabled")
         val defaultBrowserSelected = defaultWebBrowserCapability.isDefaultBrowser()
@@ -407,6 +419,11 @@ class SettingsViewModel @Inject constructor(
         }
     }
 
+    private fun windowsSettingState(): WindowsWaitlistState? {
+        if (!windowsFeature.self().isEnabled()) return null
+        return windowsWaitlist.getWaitlistState()
+    }
+
     fun onThemeSelected(selectedTheme: DuckDuckGoTheme) {
         Timber.d("User toggled theme, theme to set: $selectedTheme")
         if (themingDataStore.isCurrentlySelected(selectedTheme)) {

app/src/main/res/layout/content_settings_other.xml

@@ -14,46 +14,28 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/settingsSectionOther"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
         android:id="@+id/settingsOtherDivider"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="wrap_content" />
 
     <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
         android:id="@+id/settingsOtherTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/settingsOtherDivider"
         app:primaryText="@string/settingsHeadingMore" />
 
-    <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
-        android:id="@+id/macOsSetting"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/settingsOtherTitle"
-        app:primaryText="@string/macos_settings_title"
-        app:primaryTextTruncated="false"
-        app:secondaryText="@string/macos_settings_description"
-        app:showBetaPill="true" />
-
     <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
         android:id="@+id/emailSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/macOsSetting"
         app:primaryText="@string/settingsEmailProtectionTitle"
         app:primaryTextTruncated="false"
         app:secondaryText="@string/settingsEmailProtectionSubtitle"
@@ -63,13 +45,27 @@
         android:id="@+id/vpnSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/emailSetting"
         app:primaryText="@string/atp_SettingsTitle"
         app:primaryTextTruncated="false"
         app:secondaryText="@string/atp_SettingsDeviceShieldDisabled"
         app:showBetaPill="true" />
 
+    <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
+            android:id="@+id/macOsSetting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:primaryText="@string/macos_settings_title"
+            app:primaryTextTruncated="false"
+            app:secondaryText="@string/macos_settings_description"
+            app:showBetaPill="true" />
+
+    <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
+            android:id="@+id/windowsSetting"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:primaryText="@string/windows_settings_title"
+            app:primaryTextTruncated="false"
+            app:secondaryText="@string/windows_settings_description"
+            app:showBetaPill="true" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -28,4 +28,9 @@
     <!-- We won't have a translation for this, to be used later. -->
     <string name="trackersOverviewEmpty">No tracking requests were blocked from loading on this page. If a company\'s requests are loaded, it can allow them to profile you.</string>
 
+    <!-- Windows Settings -->
+    <string name="windows_settings_title">DuckDuckGo Windows App</string>
+    <string name="windows_settings_description">Browse privately with our app for Windows</string>
+    <string name="windows_settings_description_ready">Download available</string>
+    <string name="windows_settings_description_list">You\'re on the list!</string>
 </resources>

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

@@ -619,7 +619,7 @@
 
     <!-- MacOs Settings -->
     <string name="macos_settings_description">Browse privately with our app for Mac</string>
-    <string name="macos_settings_title">DuckDuckGo Desktop App</string>
+    <string name="macos_settings_title">DuckDuckGo Mac App</string>
 
     <!-- Downloads -->
     <string name="downloadsMenuItem">Downloads</string>

app/src/test/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt

@@ -39,6 +39,7 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.AutofillCapabilityChecker
 import com.duckduckgo.feature.toggles.api.FeatureToggle
+import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.mobile.android.ui.DuckDuckGoTheme
 import com.duckduckgo.mobile.android.ui.store.ThemingDataStore
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry
@@ -47,6 +48,9 @@ import com.duckduckgo.mobile.android.vpn.feature.AppTpSetting
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.VpnStore
 import com.duckduckgo.privacy.config.api.Gpc
 import com.duckduckgo.privacy.config.api.PrivacyFeatureName
+import com.duckduckgo.windows.api.WindowsWaitlist
+import com.duckduckgo.windows.api.WindowsWaitlistFeature
+import com.duckduckgo.windows.api.WindowsWaitlistState
 import kotlin.time.ExperimentalTime
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -113,13 +117,22 @@ class SettingsViewModelTest {
     @Mock
     private lateinit var appTpFeatureConfig: AppTpFeatureConfig
 
+    @Mock
+    private lateinit var windowsWaitlist: WindowsWaitlist
+
+    @Mock
+    private lateinit var windowsFeatureToggle: Toggle
+
     @get:Rule
     val coroutineTestRule: CoroutineTestRule = CoroutineTestRule()
 
     @Before
     fun before() {
         MockitoAnnotations.openMocks(this)
 
+        val windowsFeature: WindowsWaitlistFeature = mock()
+        whenever(windowsFeatureToggle.isEnabled()).thenReturn(false)
+        whenever(windowsFeature.self()).thenReturn(windowsFeatureToggle)
         whenever(appTpFeatureConfig.isEnabled(AppTpSetting.OpenBeta)).thenReturn(false)
         whenever(mockAppSettingsDataStore.automaticallyClearWhenOption).thenReturn(APP_EXIT_ONLY)
         whenever(mockAppSettingsDataStore.automaticallyClearWhatOption).thenReturn(CLEAR_NONE)
@@ -129,6 +142,7 @@ class SettingsViewModelTest {
         whenever(mockVariantManager.getVariant()).thenReturn(VariantManager.DEFAULT_VARIANT)
         whenever(mockAppBuildConfig.versionName).thenReturn("name")
         whenever(mockAppBuildConfig.versionCode).thenReturn(1)
+        whenever(windowsWaitlist.getWaitlistState()).thenReturn(WindowsWaitlistState.NotJoinedQueue)
 
         testee = SettingsViewModel(
             mockThemeSettingsDataStore,
@@ -145,6 +159,8 @@ class SettingsViewModelTest {
             autofillCapabilityChecker,
             vpnFeaturesRegistry,
             autoconsent,
+            windowsWaitlist,
+            windowsFeature,
         )
 
         runTest {
@@ -739,6 +755,17 @@ class SettingsViewModelTest {
         }
     }
 
+    @Test
+    fun whenWindowsSettingClickedThenEmitCommandLaunchWindows() = runTest {
+        testee.commands().test {
+            testee.windowsSettingClicked()
+
+            assertEquals(Command.LaunchWindows, awaitItem())
+
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
     @Test
     fun whenUserRequestedToChangeNotificationsSettingThenEmitLaunchNotificationsSettingsAndSendPixel() = runTest {
         testee.commands().test {

common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/TextExtensions.kt

@@ -30,7 +30,6 @@ import android.view.View
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
 import com.duckduckgo.mobile.android.R
 import com.duckduckgo.mobile.android.ui.spans.DuckDuckGoClickableSpan
 
@@ -82,7 +81,7 @@ fun TextView.addClickableLink(
             )
             setSpan(
                 ForegroundColorSpan(
-                    ContextCompat.getColor(context, R.color.cornflowerBlue),
+                    context.getColorFromAttr(R.attr.daxColorAccentBlue),
                 ),
                 fullText.getSpanStart(it),
                 fullText.getSpanEnd(it),
@@ -114,7 +113,7 @@ fun TextView.addClickableSpan(
                 )
                 setSpan(
                     ForegroundColorSpan(
-                        ContextCompat.getColor(context, R.color.cornflowerBlue),
+                        context.getColorFromAttr(R.attr.daxColorAccentBlue),
                     ),
                     fullText.getSpanStart(it),
                     fullText.getSpanEnd(it),