From ac71b47c61b6c2dcc0b016e1fd85ed3b4db98de1 Mon Sep 17 00:00:00 2001
From: Ionut Cristian Bedregeanu <ionut.bedregeanu@softvision.ro>
Date: Wed, 26 May 2021 11:31:12 +0300
Subject: [PATCH] For #19653 - Address 19643 PR comments Rename
 handleAddCreditCard to handleAddCreditCardClicked Rename onClickAddCreditCard
 to onAddCreditCardClick Format layout_add_credit_card.xml

---
 .../controller/CreditCardsManagementController.kt           | 6 +++---
 .../interactor/CreditCardsManagementInteractor.kt           | 6 +++---
 .../settings/creditcards/view/CreditCardsManagementView.kt  | 2 +-
 app/src/main/res/layout/layout_add_credit_card.xml          | 3 ++-
 .../DefaultCreditCardsManagementControllerTest.kt           | 2 +-
 .../DefaultCreditCardsManagementInteractorTest.kt           | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
index 17bd3d046..9e7416802 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/controller/CreditCardsManagementController.kt
@@ -23,9 +23,9 @@ interface CreditCardsManagementController {
     fun handleCreditCardClicked(creditCard: CreditCard)
 
     /**
-     * @see [CreditCardsManagementInteractor.onClickAddCreditCard]
+     * @see [CreditCardsManagementInteractor.onAddCreditCardClick]
      */
-    fun handleAddCreditCard()
+    fun handleAddCreditCardClicked()
 }
 
 /**
@@ -39,7 +39,7 @@ class DefaultCreditCardsManagementController(
         navigateToCreditCardEditor(creditCard)
     }
 
-    override fun handleAddCreditCard() {
+    override fun handleAddCreditCardClicked() {
         navigateToCreditCardEditor()
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
index 41f24d4b3..63286d219 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/interactor/CreditCardsManagementInteractor.kt
@@ -24,7 +24,7 @@ interface CreditCardsManagementInteractor {
      * Navigates to the credit card editor to add a new credit card. Called when a user
      * taps on 'Add credit card' button.
      */
-    fun onClickAddCreditCard()
+    fun onAddCreditCardClick()
 }
 
 /**
@@ -41,7 +41,7 @@ class DefaultCreditCardsManagementInteractor(
         controller.handleCreditCardClicked(creditCard)
     }
 
-    override fun onClickAddCreditCard() {
-        controller.handleAddCreditCard()
+    override fun onAddCreditCardClick() {
+        controller.handleAddCreditCardClicked()
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
index c219ca690..42b40634d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardsManagementView.kt
@@ -32,7 +32,7 @@ class CreditCardsManagementView(
             layoutManager = LinearLayoutManager(containerView.context)
         }
 
-        add_credit_card_button.setOnClickListener { interactor.onClickAddCreditCard() }
+        add_credit_card_button.setOnClickListener { interactor.onAddCreditCardClick() }
     }
 
     /**
diff --git a/app/src/main/res/layout/layout_add_credit_card.xml b/app/src/main/res/layout/layout_add_credit_card.xml
index 25d196477..9d9803653 100644
--- a/app/src/main/res/layout/layout_add_credit_card.xml
+++ b/app/src/main/res/layout/layout_add_credit_card.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
index f788e26fb..438a6c788 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementControllerTest.kt
@@ -64,7 +64,7 @@ class DefaultCreditCardsManagementControllerTest {
 
     @Test
     fun handleAddCreditCardClicked() {
-        controller.handleAddCreditCard()
+        controller.handleAddCreditCardClicked()
 
         verify {
             navController.navigate(
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
index 4b344a901..3dfeedf17 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/DefaultCreditCardsManagementInteractorTest.kt
@@ -32,7 +32,7 @@ class DefaultCreditCardsManagementInteractorTest {
 
     @Test
     fun onClickAddCreditCard() {
-        interactor.onClickAddCreditCard()
-        verify { controller.handleAddCreditCard() }
+        interactor.onAddCreditCardClick()
+        verify { controller.handleAddCreditCardClicked() }
     }
 }