From f927a3e73129e0041801d05e0a773ad1898498f3 Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Tue, 25 Aug 2020 13:44:00 -0400 Subject: [PATCH] [components] Issue https://github.com/mozilla-mobile/android-components/issues/7978: Part 6 - Rename addPinnedSite to addTopSite in TopSitesStorage --- .../mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt | 4 ++-- .../main/java/mozilla/components/feature/top/sites/TopSitesStorage.kt | 4 ++-- .../java/mozilla/components/feature/top/sites/TopSitesUseCases.kt | 2 +- .../components/feature/top/sites/DefaultTopSitesStorageTest.kt | 2 +- .../java/mozilla/components/feature/top/sites/TopSitesUseCasesTest.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt index fec6afdbef43..53586d0fb9db 100644 --- a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt +++ b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/DefaultTopSitesStorage.kt @@ -40,13 +40,13 @@ class DefaultTopSitesStorage( if (defaultTopSites.isNotEmpty()) { scope.launch { defaultTopSites.forEach { (title, url) -> - addPinnedSite(title, url, isDefault = true) + addTopSite(title, url, isDefault = true) } } } } - override fun addPinnedSite(title: String, url: String, isDefault: Boolean) { + override fun addTopSite(title: String, url: String, isDefault: Boolean) { scope.launch { pinnedSitesStorage.addPinnedSite(title, url, isDefault) notifyObservers { onStorageUpdated() } diff --git a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesStorage.kt b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesStorage.kt index 307a5299e38d..2e4b88868f51 100644 --- a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesStorage.kt +++ b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesStorage.kt @@ -11,14 +11,14 @@ import mozilla.components.support.base.observer.Observable */ interface TopSitesStorage : Observable { /** - * Adds a new pinned site. + * Adds a new top site. * * @param title The title string. * @param url The URL string. * @param isDefault Whether or not the pinned site added should be a default pinned site. This * is used to identify pinned sites that are added by the application. */ - fun addPinnedSite(title: String, url: String, isDefault: Boolean = false) + fun addTopSite(title: String, url: String, isDefault: Boolean = false) /** * Removes the given [TopSite]. diff --git a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesUseCases.kt b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesUseCases.kt index 6f83b575de68..92914217740d 100644 --- a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesUseCases.kt +++ b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/TopSitesUseCases.kt @@ -19,7 +19,7 @@ class TopSitesUseCases(topSitesStorage: TopSitesStorage) { * @param url The URL string. */ operator fun invoke(title: String, url: String, isDefault: Boolean = false) { - storage.addPinnedSite(title, url, isDefault) + storage.addTopSite(title, url, isDefault) } } diff --git a/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/DefaultTopSitesStorageTest.kt b/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/DefaultTopSitesStorageTest.kt index 37f40a87fadf..c6c143eb7542 100644 --- a/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/DefaultTopSitesStorageTest.kt +++ b/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/DefaultTopSitesStorageTest.kt @@ -61,7 +61,7 @@ class DefaultTopSitesStorageTest { listOf(), coroutineContext ) - defaultTopSitesStorage.addPinnedSite("Mozilla", "https://mozilla.com", isDefault = false) + defaultTopSitesStorage.addTopSite("Mozilla", "https://mozilla.com", isDefault = false) verify(pinnedSitesStorage).addPinnedSite( "Mozilla", diff --git a/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/TopSitesUseCasesTest.kt b/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/TopSitesUseCasesTest.kt index 47f9e4f9d276..b3185fee3f91 100644 --- a/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/TopSitesUseCasesTest.kt +++ b/mobile/android/android-components/components/feature/top-sites/src/test/java/mozilla/components/feature/top/sites/TopSitesUseCasesTest.kt @@ -20,7 +20,7 @@ class TopSitesUseCasesTest { val useCases = TopSitesUseCases(topSitesStorage) useCases.addPinnedSites("Mozilla", "https://www.mozilla.org", isDefault = true) - verify(topSitesStorage).addPinnedSite( + verify(topSitesStorage).addTopSite( "Mozilla", "https://www.mozilla.org", isDefault = true -- 2.11.4.GIT