Skip to content

Commit 001f547

Browse files
cmonfortepcmonfortep
committed
rename AutofillScreens and Sources ActivityParams
1 parent 271d22f commit 001f547

File tree

18 files changed

+216
-210
lines changed

18 files changed

+216
-210
lines changed

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ import com.duckduckgo.autoconsent.api.AutoconsentCallback
205205
import com.duckduckgo.autofill.api.AutofillCapabilityChecker
206206
import com.duckduckgo.autofill.api.AutofillEventListener
207207
import com.duckduckgo.autofill.api.AutofillFragmentResultsPlugin
208-
import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreenDirectlyViewCredentialsParams
209-
import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreenShowSuggestionsForSiteParams
210-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
208+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource
209+
import com.duckduckgo.autofill.api.AutofillScreens.AutofillPasswordsManagementScreenWithSuggestions
210+
import com.duckduckgo.autofill.api.AutofillScreens.AutofillPasswordsManagementViewCredential
211211
import com.duckduckgo.autofill.api.BrowserAutofill
212212
import com.duckduckgo.autofill.api.Callback
213213
import com.duckduckgo.autofill.api.CredentialAutofillDialogFactory
@@ -3144,9 +3144,9 @@ class BrowserTabFragment :
31443144
if (includeShortcutToViewCredential) {
31453145
snackbar.setAction(R.string.autofillSnackbarAction) {
31463146
context?.let {
3147-
val screen = AutofillSettingsScreenDirectlyViewCredentialsParams(
3147+
val screen = AutofillPasswordsManagementViewCredential(
31483148
loginCredentials = loginCredentials,
3149-
source = AutofillSettingsLaunchSource.BrowserSnackbar,
3149+
source = AutofillScreenLaunchSource.BrowserSnackbar,
31503150
)
31513151
globalActivityStarter.start(it, screen)
31523152
}
@@ -3157,9 +3157,9 @@ class BrowserTabFragment :
31573157
}
31583158

31593159
private fun launchAutofillManagementScreen(privacyProtectionEnabled: Boolean) {
3160-
val screen = AutofillSettingsScreenShowSuggestionsForSiteParams(
3160+
val screen = AutofillPasswordsManagementScreenWithSuggestions(
31613161
currentUrl = webView?.url,
3162-
source = AutofillSettingsLaunchSource.BrowserOverflow,
3162+
source = AutofillScreenLaunchSource.BrowserOverflow,
31633163
privacyProtectionEnabled = privacyProtectionEnabled,
31643164
)
31653165
globalActivityStarter.start(requireContext(), screen)

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAddHomeScreen
4848
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppTPOnboarding
4949
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppTPTrackersScreen
5050
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppearanceScreen
51+
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillPasswordsManagement
5152
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillSettings
52-
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillSettingsLegacy
5353
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchCookiePopupProtectionScreen
5454
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchDefaultBrowser
5555
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchDuckChatScreen
@@ -70,9 +70,9 @@ import com.duckduckgo.app.webtrackingprotection.WebTrackingProtectionScreenNoPar
7070
import com.duckduckgo.app.widget.AddWidgetLauncher
7171
import com.duckduckgo.appbuildconfig.api.AppBuildConfig
7272
import com.duckduckgo.autoconsent.impl.ui.AutoconsentSettingsActivity
73+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource
74+
import com.duckduckgo.autofill.api.AutofillScreens.AutofillPasswordsManagementScreen
7375
import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreen
74-
import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreenLegacy
75-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
7676
import com.duckduckgo.browser.api.ui.BrowserScreens.SettingsScreenNoParams
7777
import com.duckduckgo.common.ui.DuckDuckGoActivity
7878
import com.duckduckgo.common.ui.view.gone
@@ -327,8 +327,10 @@ class SettingsActivity : DuckDuckGoActivity() {
327327
private fun processCommand(it: Command) {
328328
when (it) {
329329
is LaunchDefaultBrowser -> launchDefaultAppScreen()
330-
is LaunchAutofillSettings -> launchScreen(AutofillSettingsScreen(source = AutofillSettingsLaunchSource.SettingsActivity))
331-
is LaunchAutofillSettingsLegacy -> launchScreen(AutofillSettingsScreenLegacy(source = AutofillSettingsLaunchSource.SettingsActivity))
330+
is LaunchAutofillSettings -> launchScreen(AutofillSettingsScreen(source = AutofillScreenLaunchSource.SettingsActivity))
331+
is LaunchAutofillPasswordsManagement -> launchScreen(
332+
AutofillPasswordsManagementScreen(source = AutofillScreenLaunchSource.SettingsActivity),
333+
)
332334
is LaunchAccessibilitySettings -> launchScreen(AccessibilityScreens.Default)
333335
is LaunchAppTPTrackersScreen -> launchScreen(AppTrackerActivityWithEmptyParams)
334336
is LaunchAppTPOnboarding -> launchScreen(AppTrackerOnboardingActivityWithEmptyParamsParams)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAddHomeScreen
4545
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppTPOnboarding
4646
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppTPTrackersScreen
4747
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAppearanceScreen
48+
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillPasswordsManagement
4849
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillSettings
49-
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchAutofillSettingsLegacy
5050
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchCookiePopupProtectionScreen
5151
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchDefaultBrowser
5252
import com.duckduckgo.app.settings.SettingsViewModel.Command.LaunchDuckChatScreen
@@ -128,7 +128,7 @@ class SettingsViewModel @Inject constructor(
128128
data object LaunchDefaultBrowser : Command()
129129
data class LaunchEmailProtection(val url: String) : Command()
130130
data object LaunchEmailProtectionNotSupported : Command()
131-
data object LaunchAutofillSettingsLegacy : Command()
131+
data object LaunchAutofillPasswordsManagement : Command()
132132
data object LaunchAutofillSettings : Command()
133133
data object LaunchAccessibilitySettings : Command()
134134
data object LaunchAddHomeScreenWidget : Command()
@@ -261,7 +261,7 @@ class SettingsViewModel @Inject constructor(
261261
if (autofillFeature.settingsScreen().isEnabled()) {
262262
command.send(LaunchAutofillSettings)
263263
} else {
264-
command.send(LaunchAutofillSettingsLegacy)
264+
command.send(LaunchAutofillPasswordsManagement)
265265
}
266266
}
267267
}

‎autofill/autofill-api/src/main/java/com/duckduckgo/autofill/api/AutofillScreens.kt

+12-8
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,27 @@ import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
2121

2222
sealed interface AutofillScreens {
2323

24+
/**
25+
* Launch the Autofill Settings activity, which will show autofill settings and other actions (import passwords, enable autofill, etc)
26+
* @param source is used to indicate from where in the app Autofill Settings activity was launched
27+
*/
28+
data class AutofillSettingsScreen(val source: AutofillScreenLaunchSource) : ActivityParams
29+
2430
/**
2531
* Launch the Autofill management activity, which will show the full list of available credentials
2632
* @param source is used to indicate from where in the app Autofill management activity was launched
2733
*/
28-
data class AutofillSettingsScreenLegacy(val source: AutofillSettingsLaunchSource) : ActivityParams
29-
30-
data class AutofillSettingsScreen(val source: AutofillSettingsLaunchSource) : ActivityParams
34+
data class AutofillPasswordsManagementScreen(val source: AutofillScreenLaunchSource) : ActivityParams
3135

3236
/**
3337
* Launch the Autofill management activity, which will show suggestions for the current url and the full list of available credentials
3438
* @param currentUrl The current URL the user is viewing. This is used to show suggestions for the current site if available.
3539
* @param source is used to indicate from where in the app Autofill management activity was launched
3640
* @param privacyProtectionEnabled whether privacy protection is enabled for the current web site
3741
*/
38-
data class AutofillSettingsScreenShowSuggestionsForSiteParams(
42+
data class AutofillPasswordsManagementScreenWithSuggestions(
3943
val currentUrl: String?,
40-
val source: AutofillSettingsLaunchSource,
44+
val source: AutofillScreenLaunchSource,
4145
val privacyProtectionEnabled: Boolean,
4246
) : ActivityParams
4347

@@ -46,13 +50,13 @@ sealed interface AutofillScreens {
4650
* @param loginCredentials jump directly into viewing mode for these credentials
4751
* @param source is used to indicate from where in the app Autofill management activity was launched
4852
*/
49-
data class AutofillSettingsScreenDirectlyViewCredentialsParams(
53+
data class AutofillPasswordsManagementViewCredential(
5054
val loginCredentials: LoginCredentials,
51-
val source: AutofillSettingsLaunchSource,
55+
val source: AutofillScreenLaunchSource,
5256
) : ActivityParams
5357
}
5458

55-
enum class AutofillSettingsLaunchSource {
59+
enum class AutofillScreenLaunchSource {
5660
SettingsActivity,
5761
BrowserOverflow,
5862
Sync,

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/AutofillExtensions.kt

+11-11
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
package com.duckduckgo.autofill.impl
1818

19-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
20-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.AutofillSettings
21-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.BrowserOverflow
22-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.BrowserSnackbar
23-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.DisableInSettingsPrompt
24-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.InternalDevSettings
25-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.NewTabShortcut
26-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.SettingsActivity
27-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.Sync
28-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource.Unknown
19+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource
20+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.AutofillSettings
21+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.BrowserOverflow
22+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.BrowserSnackbar
23+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.DisableInSettingsPrompt
24+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.InternalDevSettings
25+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.NewTabShortcut
26+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.SettingsActivity
27+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.Sync
28+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource.Unknown
2929

30-
fun AutofillSettingsLaunchSource.asString(): String {
30+
fun AutofillScreenLaunchSource.asString(): String {
3131
return when (this) {
3232
SettingsActivity -> "settings"
3333
BrowserOverflow -> "overflow_menu"

‎autofill/autofill-impl/src/main/java/com/duckduckgo/autofill/impl/newtab/AutofillNewTabShortcut.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package com.duckduckgo.autofill.impl.newtab
1919
import android.content.Context
2020
import com.duckduckgo.anvil.annotations.ContributesActivePlugin
2121
import com.duckduckgo.anvil.annotations.ContributesRemoteFeature
22-
import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreen
23-
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
22+
import com.duckduckgo.autofill.api.AutofillScreenLaunchSource
23+
import com.duckduckgo.autofill.api.AutofillScreens.AutofillPasswordsManagementScreen
2424
import com.duckduckgo.autofill.impl.R
2525
import com.duckduckgo.di.scopes.AppScope
2626
import com.duckduckgo.feature.toggles.api.Toggle
@@ -50,7 +50,7 @@ class AutofillNewTabShortcutPlugin @Inject constructor(
5050
}
5151

5252
override fun onClick(context: Context) {
53-
globalActivityStarter.start(context, AutofillSettingsScreen(AutofillSettingsLaunchSource.NewTabShortcut))
53+
globalActivityStarter.start(context, AutofillPasswordsManagementScreen(AutofillScreenLaunchSource.NewTabShortcut))
5454
}
5555

5656
override suspend fun isUserEnabled(): Boolean {

0 commit comments

Comments
 (0)