Show Not now as secondary button during autofill onboarding

duckduckgo · Oct 27, 2024 · 7957646 · 7957646
1 parent 6415f0f
commit 7957646
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/.../duckduckgo/autofill/impl/ui/credential/saving/AutofillSavingCredentialsDialogFragment.kt b/.../duckduckgo/autofill/impl/ui/credential/saving/AutofillSavingCredentialsDialogFragment.kt
@@ -64,6 +64,7 @@ import com.duckduckgo.autofill.impl.ui.credential.saving.AutofillSavingCredentia
 import com.duckduckgo.autofill.impl.ui.credential.saving.AutofillSavingCredentialsDialogFragment.DialogEvent.Shown
 import com.duckduckgo.autofill.impl.ui.credential.saving.AutofillSavingCredentialsViewModel.ViewState
 import com.duckduckgo.autofill.impl.ui.credential.saving.declines.AutofillDeclineCounter
+import com.duckduckgo.common.ui.view.button.DaxButton
 import com.duckduckgo.common.ui.view.prependIconToText
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.common.utils.FragmentViewModelFactory
@@ -115,6 +116,8 @@ class AutofillSavingCredentialsDialogFragment : BottomSheetDialogFragment(), Cre
 
     private lateinit var keyFeaturesContainer: ViewGroup
 
+    private lateinit var secondaryButton: DaxButton
+
     private val viewModel by lazy {
         ViewModelProvider(this, viewModelFactory)[AutofillSavingCredentialsViewModel::class.java]
     }
@@ -157,12 +160,14 @@ class AutofillSavingCredentialsDialogFragment : BottomSheetDialogFragment(), Cre
 
     private fun renderViewState(viewState: ViewState) {
         keyFeaturesContainer.isVisible = viewState.expandedDialog
+        configureSecondaryButtons(viewState.expandedDialog)
         (dialog as? BottomSheetDialog)?.behavior?.isDraggable = viewState.expandedDialog
         pixelNameDialogEvent(Shown, viewState.expandedDialog)?.let { pixel.fire(it) }
     }
 
     private fun configureViews(binding: ContentAutofillSaveNewCredentialsBinding) {
         keyFeaturesContainer = binding.keyFeaturesContainer
+        secondaryButton = binding.secondaryButton
         (dialog as BottomSheetDialog).behavior.state = BottomSheetBehavior.STATE_EXPANDED
         configureCloseButtons(binding)
         configureSaveButton(binding)
@@ -222,6 +227,16 @@ class AutofillSavingCredentialsDialogFragment : BottomSheetDialogFragment(), Cre
         }
     }
 
+    private fun onUserChoseNotNow() {
+        pixelNameDialogEvent(Dismissed, isOnboardingMode())?.let { pixel.fire(it) }
+
+        // this is another way to refuse saving credentials, so ensure that normal logic still runs
+        onUserRejectedToSaveCredentials()
+
+        // avoid the standard cancellation logic from running
+        ignoreCancellationEvents = true
+    }
+
     private fun onUserChoseNeverSaveThisSite() {
         pixelNameDialogEvent(Exclude, isOnboardingMode())?.let { pixel.fire(it) }
         viewModel.addSiteToNeverSaveList(getOriginalUrl())
@@ -239,9 +254,21 @@ class AutofillSavingCredentialsDialogFragment : BottomSheetDialogFragment(), Cre
      */
     private fun configureCloseButtons(binding: ContentAutofillSaveNewCredentialsBinding) {
         binding.closeButton.setOnClickListener { animateClosed() }
-        binding.neverSaveForThisSiteButton.setOnClickListener {
-            onUserChoseNeverSaveThisSite()
-            animateClosed()
+    }
+
+    private fun configureSecondaryButtons(isOnboarding: Boolean) {
+        if (isOnboarding) {
+            secondaryButton.text = getString(R.string.saveOnboardingLoginDialogNotNow)
+            secondaryButton.setOnClickListener {
+                onUserChoseNotNow()
+                animateClosed()
+            }
+        } else {
+            secondaryButton.text = getString(R.string.saveLoginDialogNeverForThisSite)
+            secondaryButton.setOnClickListener {
+                onUserChoseNeverSaveThisSite()
+                animateClosed()
+            }
         }
     }
 

diff --git a/...a/com/duckduckgo/autofill/impl/ui/credential/saving/AutofillSavingCredentialsViewModel.kt b/...a/com/duckduckgo/autofill/impl/ui/credential/saving/AutofillSavingCredentialsViewModel.kt
@@ -46,7 +46,7 @@ class AutofillSavingCredentialsViewModel @Inject constructor(
         viewModelScope.launch(dispatchers.io()) {
             val shouldShowExpandedView = autofillDeclineCounter.declineCount() < 2 && autofillDeclineCounter.isDeclineCounterActive()
             _viewState.value = ViewState(shouldShowExpandedView)
-            Timber.d("Autofill: AutofillSavingCredentialsViewModel initialized")
+            Timber.d("Autofill: AutofillSavingCredentialsViewModel initialized with expanded view state: $shouldShowExpandedView")
         }
     }
 

diff --git a/autofill/autofill-impl/src/main/res/layout/content_autofill_save_new_credentials.xml b/autofill/autofill-impl/src/main/res/layout/content_autofill_save_new_credentials.xml
@@ -146,10 +146,9 @@
                 app:layout_constraintTop_toBottomOf="@id/keyFeaturesContainer" />
 
             <com.duckduckgo.common.ui.view.button.DaxButtonGhost
-                android:id="@+id/neverSaveForThisSiteButton"
+                android:id="@+id/secondaryButton"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/saveLoginDialogNeverForThisSite"
                 app:buttonSize="large"
                 app:layout_constraintEnd_toEndOf="@id/saveLoginButton"
                 app:layout_constraintStart_toStartOf="@id/saveLoginButton"

diff --git a/autofill/autofill-impl/src/main/res/values/donottranslate.xml b/autofill/autofill-impl/src/main/res/values/donottranslate.xml
@@ -17,4 +17,6 @@
 <resources>
     <!-- New Tab -->
     <string name="newTabPageShortcutPasswords">Passwords</string>
+
+    <string name="saveOnboardingLoginDialogNotNow">Not Now</string>
 </resources>