Some NetP cleanup (#3980)

<!--
Note: This checklist is a reminder of our shared engineering
expectations.
The items in Bold are required
If your PR involves UI changes:
1. Upload screenshots or screencasts that illustrate the changes before
/ after
2. Add them under the UI changes section (feel free to add more columns
if needed)
If your PR does not involve UI changes, you can remove the **UI
changes** section

At a minimum, make sure your changes are tested in API 23 and one of the
more recent API levels available.
-->

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

### Description
https://app.asana.com/0/488551667048375/1206101327273496/f

### Steps to test this PR
QA-optional, as long the build successfully builds. Smoke test NetP

app-tracking-protection/app-tracking-api/src/main/java/com/duckduckgo/mobile/android/app/tracking/ui/AppTrackingProtectionScreens.kt

@@ -18,18 +18,20 @@ package com.duckduckgo.mobile.android.app.tracking.ui
 
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 
-/**
- * Use this class to launch the AppTP Tracker Activity Screen
- * ```kotlin
- * globalActivityStarter.start(context, DeviceShieldTrackerActivityWithEmptyParams)
- * ```
- */
-object AppTrackerActivityWithEmptyParams : GlobalActivityStarter.ActivityParams
+sealed class AppTrackingProtectionScreens {
+    /**
+     * Use this class to launch the AppTP Tracker Activity Screen
+     * ```kotlin
+     * globalActivityStarter.start(context, DeviceShieldTrackerActivityWithEmptyParams)
+     * ```
+     */
+    object AppTrackerActivityWithEmptyParams : GlobalActivityStarter.ActivityParams
 
-/**
- * Use this class to launch the AppTP onboarding screen
- * ```kotlin
- * globalActivityStarter.start(context, AppTrackerOnboardingActivityWithEmptyParamsParams)
- * ```
- */
-object AppTrackerOnboardingActivityWithEmptyParamsParams : GlobalActivityStarter.ActivityParams
+    /**
+     * Use this class to launch the AppTP onboarding screen
+     * ```kotlin
+     * globalActivityStarter.start(context, AppTrackerOnboardingActivityWithEmptyParamsParams)
+     * ```
+     */
+    object AppTrackerOnboardingActivityWithEmptyParamsParams : GlobalActivityStarter.ActivityParams
+}

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/alwayson/AlwaysOnLockDownDetector.kt

@@ -24,15 +24,15 @@ import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.VpnScope
 import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerActivityWithEmptyParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerActivityWithEmptyParams
 import com.duckduckgo.mobile.android.vpn.R
 import com.duckduckgo.mobile.android.vpn.dao.VpnServiceStateStatsDao
 import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
 import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor
 import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldAlertNotificationBuilder
 import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationFactory
 import com.duckduckgo.navigation.api.GlobalActivityStarter
-import com.duckduckgo.networkprotection.api.NetworkProtectionManagementScreenNoParams
+import com.duckduckgo.networkprotection.api.NetworkProtectionScreens.NetworkProtectionManagementScreenNoParams
 import com.duckduckgo.networkprotection.api.NetworkProtectionState
 import com.squareup.anvil.annotations.ContributesMultibinding
 import dagger.SingleInstanceIn

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/onboarding/VpnOnboardingActivity.kt

@@ -35,7 +35,7 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.extensions.launchAlwaysOnSystemSettings
 import com.duckduckgo.di.scopes.ActivityScope
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerOnboardingActivityWithEmptyParamsParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerOnboardingActivityWithEmptyParamsParams
 import com.duckduckgo.mobile.android.vpn.AppTpVpnFeature
 import com.duckduckgo.mobile.android.vpn.R
 import com.duckduckgo.mobile.android.vpn.R.string

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt

@@ -62,7 +62,7 @@ import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.AppTPCompanyTracker
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.AppTPCompanyTrackersViewModel.ViewState
 import com.duckduckgo.mobile.android.vpn.ui.util.TextDrawable
 import com.duckduckgo.navigation.api.GlobalActivityStarter
-import com.duckduckgo.networkprotection.api.NetPAppExclusionListNoParams
+import com.duckduckgo.networkprotection.api.NetworkProtectionScreens.NetPAppExclusionListNoParams
 import com.google.android.material.snackbar.Snackbar
 import javax.inject.Inject
 import javax.inject.Provider

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt

@@ -48,7 +48,7 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.extensions.launchAlwaysOnSystemSettings
 import com.duckduckgo.di.scopes.ActivityScope
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerActivityWithEmptyParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerActivityWithEmptyParams
 import com.duckduckgo.mobile.android.vpn.AppTpVpnFeature
 import com.duckduckgo.mobile.android.vpn.R
 import com.duckduckgo.mobile.android.vpn.VpnFeaturesRegistry

app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoActivity.kt

@@ -43,7 +43,7 @@ import com.duckduckgo.common.utils.AppUrl.Url
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.mobile.android.R.attr
 import com.duckduckgo.navigation.api.GlobalActivityStarter
-import com.duckduckgo.networkprotection.api.NetPWaitlistInvitedScreenNoParams
+import com.duckduckgo.networkprotection.api.NetworkProtectionScreens.NetPWaitlistInvitedScreenNoParams
 import com.google.android.material.snackbar.Snackbar
 import javax.inject.Inject
 import kotlinx.coroutines.flow.launchIn

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -235,7 +235,7 @@ import com.duckduckgo.js.messaging.api.JsCallbackData
 import com.duckduckgo.js.messaging.api.JsMessageCallback
 import com.duckduckgo.js.messaging.api.JsMessageHelper
 import com.duckduckgo.js.messaging.api.JsMessaging
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerOnboardingActivityWithEmptyParamsParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerOnboardingActivityWithEmptyParamsParams
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.remote.messaging.api.RemoteMessage
 import com.duckduckgo.savedsites.api.models.SavedSite

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

@@ -61,8 +61,8 @@ import com.duckduckgo.di.DaggerMap
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.internal.features.api.InternalFeaturePlugin
 import com.duckduckgo.macos.api.MacOsScreenWithEmptyParams
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerActivityWithEmptyParams
-import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackerOnboardingActivityWithEmptyParamsParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerActivityWithEmptyParams
+import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerOnboardingActivityWithEmptyParamsParams
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
 import com.duckduckgo.settings.api.ProSettingsPlugin

network-protection/network-protection-api/src/main/java/com/duckduckgo/networkprotection/api/NetworkProtectionScreens.kt

@@ -17,24 +17,25 @@
 package com.duckduckgo.networkprotection.api
 
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
+sealed class NetworkProtectionScreens {
+    /**
+     * Use this model to launch the NetworkProtectionManagement screen
+     */
+    object NetworkProtectionManagementScreenNoParams : ActivityParams
 
-/**
- * Use this model to launch the NetworkProtectionManagement screen
- */
-object NetworkProtectionManagementScreenNoParams : ActivityParams
+    /**
+     * Use this model to launch the NetworkProtectionManagement screen
+     * @param enable `true` if you want to both open the screen and enable NetP in case it's not yet enabled.
+     */
+    data class NetworkProtectionManagementScreenAndEnable(val enable: Boolean) : ActivityParams
 
-/**
- * Use this model to launch the NetworkProtectionManagement screen
- * @param enable `true` if you want to both open the screen and enable NetP in case it's not yet enabled.
- */
-data class NetworkProtectionManagementScreenAndEnable(val enable: Boolean) : ActivityParams
+    /**
+     * Use this model to launch the NetPWaitlist screen
+     */
+    object NetPWaitlistInvitedScreenNoParams : ActivityParams
 
-/**
- * Use this model to launch the NetPWaitlist screen
- */
-object NetPWaitlistInvitedScreenNoParams : ActivityParams
-
-/**
- * Use this model to launch the NetP app exclusion list screen
- */
-object NetPAppExclusionListNoParams : ActivityParams
+    /**
+     * Use this model to launch the NetP app exclusion list screen
+     */
+    object NetPAppExclusionListNoParams : ActivityParams
+}

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/about/NetPTermsActivity.kt

@@ -22,6 +22,7 @@ import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.networkprotection.impl.about.NetworkProtectionAboutScreens.NetPTermsScreenNoParams
 import com.duckduckgo.networkprotection.impl.databinding.ActivityNetpTermsBinding
 import com.duckduckgo.networkprotection.impl.pixels.NetworkProtectionPixels
 import javax.inject.Inject

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/about/NetpAboutVpnActivity.kt

@@ -22,6 +22,7 @@ import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.networkprotection.impl.about.NetworkProtectionAboutScreens.NetPAboutVPNScreenNoParams
 import com.duckduckgo.networkprotection.impl.databinding.ActivityNetpInfoVpnBinding
 import com.duckduckgo.networkprotection.impl.pixels.NetworkProtectionPixels
 import javax.inject.Inject

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/about/NetpFaqActivity.kt

@@ -22,6 +22,7 @@ import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.networkprotection.impl.about.NetworkProtectionAboutScreens.NetPFaqsScreenNoParams
 import com.duckduckgo.networkprotection.impl.databinding.ActivityNetpFaqsBinding
 import com.duckduckgo.networkprotection.impl.pixels.NetworkProtectionPixels
 import javax.inject.Inject

network-protection/network-protection-impl/src/main/java/com/duckduckgo/networkprotection/impl/about/NetworkProtectionAboutScreens.kt

@@ -18,17 +18,19 @@ package com.duckduckgo.networkprotection.impl.about
 
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
 
-/**
- * Use this model to launch the "What is a VPN" screen
- */
-object NetPAboutVPNScreenNoParams : ActivityParams
+sealed class NetworkProtectionAboutScreens {
+    /**
+     * Use this model to launch the "What is a VPN" screen
+     */
+    object NetPAboutVPNScreenNoParams : ActivityParams
 
-/**
- * Use this model to launch the "Network Protection FAQs" screen
- */
-object NetPFaqsScreenNoParams : ActivityParams
+    /**
+     * Use this model to launch the "Network Protection FAQs" screen
+     */
+    object NetPFaqsScreenNoParams : ActivityParams
 
-/**
- * Use this model to launch the "Network Protection" terms and conditions screen
- */
-object NetPTermsScreenNoParams : ActivityParams
+    /**
+     * Use this model to launch the "Network Protection" terms and conditions screen
+     */
+    object NetPTermsScreenNoParams : ActivityParams
+}