ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #24780 - Part 2: RenameCreditCardsSettingFragment to AutofillSettingFragment in nav_graph.xml

This commit is contained in:
Gabriel Luong 2022-04-14 00:45:33 -04:00 committed by mergify[bot]
parent 2b86e25a4a
commit 61bc862657
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -626,7 +626,7 @@ abstract class BaseBrowserFragment :
creditCardPickerView = binding.creditCardSelectBar,
onManageCreditCards = {
val directions =
NavGraphDirections.actionGlobalCreditCardsSettingFragment()
NavGraphDirections.actionGlobalAutofillSettingFragment()
findNavController().navigate(directions)
},
onSelectCreditCard = {

2
app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
View File

@ -84,7 +84,7 @@ fun Fragment.redirectToReAuth(
}
R.id.creditCardEditorFragment,
R.id.creditCardsManagementFragment -> {
findNavController().popBackStack(R.id.creditCardsSettingFragment, false)
findNavController().popBackStack(R.id.autofillSettingFragment, false)
}
}
}

2
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -314,7 +314,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
SettingsFragmentDirections.actionSettingsFragmentToSavedLoginsAuthFragment()
}
resources.getString(R.string.pref_key_credit_cards) -> {
SettingsFragmentDirections.actionSettingsFragmentToCreditCardsSettingFragment()
SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment()
}
resources.getString(R.string.pref_key_about) -> {
SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()

8
app/src/main/java/org/mozilla/fenix/settings/creditcards/AutofillSettingFragment.kt
View File

@ -165,8 +165,8 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() {
verifyCredentialsOrShowSetupWarning(requireContext(), creditCardPreferences)
} else {
navController.navigate(
CreditCardsSettingFragmentDirections
.actionCreditCardsSettingFragmentToCreditCardEditorFragment()
AutofillSettingFragmentDirections
.actionAutofillSettingFragmentToCreditCardEditorFragment()
)
}
super.onPreferenceTreeClick(it)
@ -233,8 +233,8 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() {
private fun navigateToCreditCardManagementFragment() {
val directions =
CreditCardsSettingFragmentDirections
.actionCreditCardsSettingFragmentToCreditCardsManagementFragment()
AutofillSettingFragmentDirections
.actionAutofillSettingFragmentToCreditCardsManagementFragment()
findNavController().navigate(directions)
}

20
app/src/main/res/navigation/nav_graph.xml
View File

@ -141,8 +141,8 @@
android:id="@+id/action_global_savedLoginsAuthFragment"
app:destination="@id/savedLoginsAuthFragment" />
<action
android:id="@+id/action_global_creditCardsSettingFragment"
app:destination="@id/credit_cards_graph" />
android:id="@+id/action_global_autofillSettingFragment"
app:destination="@id/autofill_graph" />
<action
android:id="@+id/action_global_tabHistoryDialogFragment"
app:destination="@id/tabHistoryDialogFragment" />
@ -513,8 +513,8 @@
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
<action
android:id="@+id/action_settingsFragment_to_creditCardsSettingFragment"
app:destination="@id/credit_cards_graph"
android:id="@+id/action_settingsFragment_to_autofillSettingFragment"
app:destination="@id/autofill_graph"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
@ -1186,21 +1186,21 @@
</navigation>
<navigation
android:id="@+id/credit_cards_graph"
app:startDestination="@id/creditCardsSettingFragment">
android:id="@+id/autofill_graph"
app:startDestination="@id/autofillSettingFragment">
<fragment
android:id="@+id/creditCardsSettingFragment"
android:name="org.mozilla.fenix.settings.creditcards.CreditCardsSettingFragment"
android:id="@+id/autofillSettingFragment"
android:name="org.mozilla.fenix.settings.creditcards.AutofillSettingFragment"
android:label="@string/preferences_credit_cards">
<action
android:id="@+id/action_creditCardsSettingFragment_to_creditCardEditorFragment"
android:id="@+id/action_autofillSettingFragment_to_creditCardEditorFragment"
app:destination="@id/creditCardEditorFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"
app:popEnterAnim="@anim/slide_in_left"
app:popExitAnim="@anim/slide_out_right" />
<action
android:id="@+id/action_creditCardsSettingFragment_to_creditCardsManagementFragment"
android:id="@+id/action_autofillSettingFragment_to_creditCardsManagementFragment"
app:destination="@id/creditCardsManagementFragment"
app:enterAnim="@anim/slide_in_right"
app:exitAnim="@anim/slide_out_left"

4
app/src/main/res/values/strings.xml
View File

@ -1480,7 +1480,9 @@
<!-- Content description (not visible, for screen readers etc.): Sort saved logins dropdown menu chevron icon -->
<string name="saved_logins_menu_dropdown_chevron_icon_content_description">Sort logins menu</string>
<!-- Credit Cards Autofill -->
<!-- Autofill -->
<!-- Preference and title for managing the autofill settings -->
<string name="preferences_autofill">Autofill</string>
<!-- Preference and title for managing the settings for credit cards -->
<string name="preferences_credit_cards">Credit cards</string>
<!-- Preference for saving and autofilling credit cards -->

4
app/src/test/java/org/mozilla/fenix/settings/creditcards/AutofillSettingFragmentTest.kt
View File

@ -77,8 +77,8 @@ class AutofillSettingFragmentTest {
)
val directions =
CreditCardsSettingFragmentDirections
.actionCreditCardsSettingFragmentToCreditCardEditorFragment()
AutofillSettingFragmentDirections
.actionAutofillSettingFragmentToCreditCardEditorFragment()
val creditCardsState = CreditCardsListState(creditCards = emptyList())
val creditCardsStore = CreditCardsFragmentStore(creditCardsState)