diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt index 16c56d9f5f9a..4fffa973aed1 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt @@ -56,13 +56,11 @@ import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchEmailProte import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchFeedback import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchFireButtonScreen import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchGeneralSettingsScreen -import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchMacOs import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPermissionsScreen import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPproUnifiedFeedback import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPrivateSearchWebPage import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchSyncSettings import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchWebTrackingProtectionScreen -import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchWindows import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.app.statistics.pixels.Pixel.PixelType.Daily import com.duckduckgo.app.webtrackingprotection.WebTrackingProtectionScreenNoParams @@ -79,7 +77,6 @@ import com.duckduckgo.common.ui.viewbinding.viewBinding import com.duckduckgo.common.utils.plugins.PluginPoint 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.AppTrackingProtectionScreens.AppTrackerActivityWithEmptyParams import com.duckduckgo.mobile.android.app.tracking.ui.AppTrackingProtectionScreens.AppTrackerOnboardingActivityWithEmptyParamsParams import com.duckduckgo.navigation.api.GlobalActivityStarter @@ -87,7 +84,6 @@ import com.duckduckgo.settings.api.DuckPlayerSettingsPlugin import com.duckduckgo.settings.api.ProSettingsPlugin import com.duckduckgo.subscriptions.api.PrivacyProFeedbackScreens.GeneralPrivacyProFeedbackScreenNoParams import com.duckduckgo.sync.api.SyncActivityWithEmptyParams -import com.duckduckgo.windows.api.ui.WindowsScreenWithEmptyParams import com.google.android.material.snackbar.Snackbar import javax.inject.Inject import kotlinx.coroutines.flow.distinctUntilChanged @@ -315,8 +311,6 @@ class NewSettingsActivity : DuckDuckGoActivity() { is LaunchEmailProtection -> launchEmailProtectionScreen(it.url) is LaunchEmailProtectionNotSupported -> launchEmailProtectionNotSupported() is LaunchAddHomeScreenWidget -> launchAddHomeScreenWidget() - is LaunchMacOs -> launchMacOsScreen() - is LaunchWindows -> launchWindowsScreen() is LaunchSyncSettings -> launchSyncSettings() is LaunchPrivateSearchWebPage -> launchPrivateSearchScreen() is LaunchWebTrackingProtectionScreen -> launchWebTrackingProtectionScreen() @@ -372,16 +366,6 @@ class NewSettingsActivity : DuckDuckGoActivity() { globalActivityStarter.start(this, EmailProtectionUnsupportedScreenNoParams, options) } - private fun launchMacOsScreen() { - val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle() - globalActivityStarter.start(this, MacOsScreenWithEmptyParams, options) - } - - private fun launchWindowsScreen() { - val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle() - globalActivityStarter.start(this, WindowsScreenWithEmptyParams, options) - } - private fun launchSyncSettings() { val options = ActivityOptions.makeSceneTransitionAnimation(this).toBundle() globalActivityStarter.start(this, SyncActivityWithEmptyParams, options) diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt index cc7f28f37e78..4a8291b78024 100644 --- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsViewModel.kt @@ -34,13 +34,11 @@ import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_DEFAULT_BROWSER_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_EMAIL_PROTECTION_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_FIRE_BUTTON_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_GENERAL_PRESSED -import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_MAC_APP_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_OPENED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_PERMISSIONS_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_PRIVATE_SEARCH_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_SYNC_PRESSED import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_WEB_TRACKING_PROTECTION_PRESSED -import com.duckduckgo.app.pixels.AppPixelName.SETTINGS_WINDOWS_APP_PRESSED import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchAboutScreen import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchAccessibilitySettings import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchAddHomeScreenWidget @@ -55,13 +53,11 @@ import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchEmailProte import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchFeedback import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchFireButtonScreen import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchGeneralSettingsScreen -import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchMacOs import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPermissionsScreen import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPproUnifiedFeedback import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchPrivateSearchWebPage import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchSyncSettings import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchWebTrackingProtectionScreen -import com.duckduckgo.app.settings.NewSettingsViewModel.Command.LaunchWindows import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.autoconsent.api.Autoconsent import com.duckduckgo.autofill.api.AutofillCapabilityChecker @@ -128,8 +124,6 @@ class NewSettingsViewModel @Inject constructor( data object LaunchAddHomeScreenWidget : Command() data object LaunchAppTPTrackersScreen : Command() data object LaunchAppTPOnboarding : Command() - data object LaunchMacOs : Command() - data object LaunchWindows : Command() data object LaunchSyncSettings : Command() data object LaunchPrivateSearchWebPage : Command() data object LaunchWebTrackingProtectionScreen : Command()