Merge branch 'issue/20621-announcement-card-in-feeds' of github.com:wordpress-mobile/WordPress-Android into issue/20621-announcement-card-in-tags-feed

Author: Thomas Horta

WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java

@@ -46,7 +46,7 @@
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostNewViewHolder;
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostViewHolder;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId;
-import org.wordpress.android.ui.reader.repository.ReaderAnnouncementRepository;
+import org.wordpress.android.ui.reader.utils.ReaderAnnouncementHelper;
 import org.wordpress.android.ui.reader.tracker.ReaderTab;
 import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderXPostUtils;
@@ -135,7 +135,7 @@ public class ReaderPostAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     @Inject ReaderPostMoreButtonUiStateBuilder mReaderPostMoreButtonUiStateBuilder;
     @Inject ReaderTracker mReaderTracker;
     @Inject ReaderImprovementsFeatureConfig mReaderImprovementsFeatureConfig;
-    @Inject ReaderAnnouncementRepository mReaderAnnouncementRepository;
+    @Inject ReaderAnnouncementHelper mReaderAnnouncementHelper;
 
     public String getSource() {
         return mSource;
@@ -329,9 +329,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         } else if (holder instanceof ReaderAnnouncementCardViewHolder) {
             ReaderAnnouncementCardViewHolder announcementViewHolder = (ReaderAnnouncementCardViewHolder) holder;
             announcementViewHolder.mAnnouncementCardView
-                    .setItems(mReaderAnnouncementRepository.getReaderAnnouncementItems());
+                    .setItems(mReaderAnnouncementHelper.getReaderAnnouncementItems());
             announcementViewHolder.mAnnouncementCardView.setOnDoneClickListener(() -> {
-                mReaderAnnouncementRepository.dismissReaderAnnouncement();
+                mReaderAnnouncementHelper.dismissReaderAnnouncement();
                 notifyItemRemoved(getAnnouncementPosition());
             });
         }
@@ -717,7 +717,7 @@ private boolean hasTagHeader() {
     }
 
     private boolean hasAnnouncement() {
-        return mIsMainReader && mReaderAnnouncementRepository.hasReaderAnnouncement() && !isEmpty()
+        return mIsMainReader && mReaderAnnouncementHelper.hasReaderAnnouncement() && !isEmpty()
                && (getPostListType() != ReaderPostListType.BLOG_PREVIEW)
                && (mCurrentTag != null && !mCurrentTag.isTagTopic());
     }

WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt

@@ -27,7 +27,7 @@ import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPosts
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderSubs
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
-import org.wordpress.android.ui.reader.repository.ReaderAnnouncementRepository
+import org.wordpress.android.ui.reader.utils.ReaderAnnouncementHelper
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication.Error
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication.Started
@@ -63,7 +63,7 @@ class ReaderDiscoverViewModel @Inject constructor(
     displayUtilsWrapper: DisplayUtilsWrapper,
     private val getFollowedTagsUseCase: GetFollowedTagsUseCase,
     private val readerImprovementsFeatureConfig: ReaderImprovementsFeatureConfig,
-    private val readerAnnouncementRepository: ReaderAnnouncementRepository,
+    private val readerAnnouncementHelper: ReaderAnnouncementHelper,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(mainDispatcher) {
@@ -161,10 +161,10 @@ class ReaderDiscoverViewModel @Inject constructor(
                     }
                 } else {
                     if (posts != null && posts.cards.isNotEmpty()) {
-                        val announcement = if (readerAnnouncementRepository.hasReaderAnnouncement()) {
+                        val announcement = if (readerAnnouncementHelper.hasReaderAnnouncement()) {
                             listOf(
                                 ReaderCardUiState.ReaderAnnouncementCardUiState(
-                                    readerAnnouncementRepository.getReaderAnnouncementItems(),
+                                    readerAnnouncementHelper.getReaderAnnouncementItems(),
                                     ::dismissAnnouncementCard
                                 )
                             )
@@ -192,7 +192,7 @@ class ReaderDiscoverViewModel @Inject constructor(
     }
 
     private fun dismissAnnouncementCard() {
-        readerAnnouncementRepository.dismissReaderAnnouncement()
+        readerAnnouncementHelper.dismissReaderAnnouncement()
         _uiState.value = (_uiState.value as? DiscoverUiState.ContentUiState)?.let { contentUiState ->
             contentUiState.copy(
                 cards = contentUiState.cards.filterNot { it is ReaderCardUiState.ReaderAnnouncementCardUiState }

WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderAnnouncementRepository.kt renamed to WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderAnnouncementHelper.kt

@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.reader.repository
+package org.wordpress.android.ui.reader.utils
 
 import dagger.Reusable
 import org.wordpress.android.R
@@ -11,7 +11,7 @@ import org.wordpress.android.util.config.ReaderTagsFeedFeatureConfig
 import javax.inject.Inject
 
 @Reusable
-class ReaderAnnouncementRepository @Inject constructor(
+class ReaderAnnouncementHelper @Inject constructor(
     private val readerAnnouncementCardFeatureConfig: ReaderAnnouncementCardFeatureConfig,
     private val readerTagsFeedFeatureConfig: ReaderTagsFeedFeatureConfig,
     private val appPrefsWrapper: AppPrefsWrapper,

WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/tagsfeed/ReaderTagsFeedViewModel.kt

@@ -28,10 +28,10 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.discover.ReaderPostMoreButtonUiStateBuilder
 import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
 import org.wordpress.android.ui.reader.exceptions.ReaderPostFetchException
-import org.wordpress.android.ui.reader.repository.ReaderAnnouncementRepository
 import org.wordpress.android.ui.reader.repository.ReaderPostRepository
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.utils.ReaderAnnouncementHelper
 import org.wordpress.android.ui.reader.views.compose.ReaderAnnouncementCardItemData
 import org.wordpress.android.ui.reader.views.compose.tagsfeed.TagsFeedPostItem
 import org.wordpress.android.util.DisplayUtilsWrapper
@@ -55,7 +55,7 @@ class ReaderTagsFeedViewModel @Inject constructor(
     private val displayUtilsWrapper: DisplayUtilsWrapper,
     private val readerTracker: ReaderTracker,
     private val networkUtilsWrapper: NetworkUtilsWrapper,
-    private val readerAnnouncementRepository: ReaderAnnouncementRepository,
+    private val readerAnnouncementHelper: ReaderAnnouncementHelper,
 ) : ScopedViewModel(bgDispatcher) {
     private val _uiStateFlow: MutableStateFlow<UiState> = MutableStateFlow(UiState.Initial)
     val uiStateFlow: StateFlow<UiState> = _uiStateFlow
@@ -154,17 +154,17 @@ class ReaderTagsFeedViewModel @Inject constructor(
     }
 
     private fun getAnnouncementItem(): ReaderAnnouncementItem? =
-        if (readerAnnouncementRepository.hasReaderAnnouncement()) {
+        if (readerAnnouncementHelper.hasReaderAnnouncement()) {
             ReaderAnnouncementItem(
-                items = readerAnnouncementRepository.getReaderAnnouncementItems(),
+                items = readerAnnouncementHelper.getReaderAnnouncementItems(),
                 onDoneClicked = ::dismissAnnouncementItem,
             )
         } else {
             null
         }
 
     private fun dismissAnnouncementItem() {
-        readerAnnouncementRepository.dismissReaderAnnouncement()
+        readerAnnouncementHelper.dismissReaderAnnouncement()
         _uiStateFlow.update {
             (it as? UiState.Loaded)?.copy(announcementItem = null) ?: it
         }

WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModelTest.kt

@@ -54,7 +54,7 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.LIKE
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REBLOG
 import org.wordpress.android.ui.reader.discover.interests.TagUiState
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
-import org.wordpress.android.ui.reader.repository.ReaderAnnouncementRepository
+import org.wordpress.android.ui.reader.utils.ReaderAnnouncementHelper
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication.Error.NetworkUnavailable
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication.Started
@@ -139,7 +139,7 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
     private lateinit var readerImprovementsFeatureConfig: ReaderImprovementsFeatureConfig
 
     @Mock
-    private lateinit var readerAnnouncementRepository: ReaderAnnouncementRepository
+    private lateinit var mReaderAnnouncementHelper: ReaderAnnouncementHelper
 
     private val fakeDiscoverFeed = ReactiveMutableLiveData<ReaderDiscoverCards>()
     private val fakeCommunicationChannel = MutableLiveData<Event<ReaderDiscoverCommunication>>()
@@ -164,7 +164,7 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
             displayUtilsWrapper,
             getFollowedTagsUseCase,
             readerImprovementsFeatureConfig,
-            readerAnnouncementRepository,
+            mReaderAnnouncementHelper,
             testDispatcher(),
             testDispatcher()
         )
@@ -408,7 +408,7 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
     @Test
     fun `if Announcement does not exist then ReaderAnnouncementCardUiState will not be present`() = test {
         // Arrange
-        whenever(readerAnnouncementRepository.hasReaderAnnouncement()).thenReturn(false)
+        whenever(mReaderAnnouncementHelper.hasReaderAnnouncement()).thenReturn(false)
         val uiStates = init(autoUpdateFeed = false).uiStates
         // Act
         fakeDiscoverFeed.value = createDummyReaderCardsList() // mock finished loading
@@ -421,8 +421,8 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
     @Test
     fun `if Announcement exists then ReaderAnnouncementCardUiState will be present`() = test {
         // Arrange
-        whenever(readerAnnouncementRepository.hasReaderAnnouncement()).thenReturn(true)
-        whenever(readerAnnouncementRepository.getReaderAnnouncementItems()).thenReturn(mock())
+        whenever(mReaderAnnouncementHelper.hasReaderAnnouncement()).thenReturn(true)
+        whenever(mReaderAnnouncementHelper.getReaderAnnouncementItems()).thenReturn(mock())
         val uiStates = init(autoUpdateFeed = false).uiStates
         // Act
         fakeDiscoverFeed.value = createDummyReaderCardsList() // mock finished loading
@@ -435,8 +435,8 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
     @Test
     fun `clicking done on ReaderAnnouncementCardUiState dismisses and updates the ContentUiState`() = test {
         // Arrange
-        whenever(readerAnnouncementRepository.hasReaderAnnouncement()).thenReturn(true)
-        whenever(readerAnnouncementRepository.getReaderAnnouncementItems()).thenReturn(mock())
+        whenever(mReaderAnnouncementHelper.hasReaderAnnouncement()).thenReturn(true)
+        whenever(mReaderAnnouncementHelper.getReaderAnnouncementItems()).thenReturn(mock())
         val uiStates = init(autoUpdateFeed = false).uiStates
 
         fakeDiscoverFeed.value = createDummyReaderCardsList() // mock finished loading
@@ -447,7 +447,7 @@ class ReaderDiscoverViewModelTest : BaseUnitTest() {
         announcementCard.onDoneClick()
 
         // Assert
-        verify(readerAnnouncementRepository).dismissReaderAnnouncement()
+        verify(mReaderAnnouncementHelper).dismissReaderAnnouncement()
 
         val newContentUiState = uiStates.last() as ContentUiState
         assertThat(newContentUiState.cards.first())

WordPress/src/test/java/org/wordpress/android/ui/reader/repository/ReaderAnnouncementRepositoryTest.kt renamed to WordPress/src/test/java/org/wordpress/android/ui/reader/utils/ReaderAnnouncementHelperTest.kt

@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.reader.repository
+package org.wordpress.android.ui.reader.utils
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -16,7 +16,7 @@ import org.wordpress.android.util.config.ReaderAnnouncementCardFeatureConfig
 import org.wordpress.android.util.config.ReaderTagsFeedFeatureConfig
 
 @RunWith(MockitoJUnitRunner::class)
-class ReaderAnnouncementRepositoryTest {
+class ReaderAnnouncementHelperTest {
     @Mock
     private lateinit var readerAnnouncementCardFeatureConfig: ReaderAnnouncementCardFeatureConfig
 
@@ -29,11 +29,11 @@ class ReaderAnnouncementRepositoryTest {
     @Mock
     private lateinit var readerTracker: ReaderTracker
 
-    private lateinit var repository: ReaderAnnouncementRepository
+    private lateinit var repository: ReaderAnnouncementHelper
 
     @Before
     fun setUp() {
-        repository = ReaderAnnouncementRepository(
+        repository = ReaderAnnouncementHelper(
             readerAnnouncementCardFeatureConfig,
             readerTagsFeedFeatureConfig,
             appPrefsWrapper,

WordPress/src/test/java/org/wordpress/android/ui/reader/viewmodels/ReaderTagsFeedViewModelTest.kt

@@ -37,10 +37,10 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.discover.ReaderPostMoreButtonUiStateBuilder
 import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
 import org.wordpress.android.ui.reader.exceptions.ReaderPostFetchException
-import org.wordpress.android.ui.reader.repository.ReaderAnnouncementRepository
 import org.wordpress.android.ui.reader.repository.ReaderPostRepository
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.utils.ReaderAnnouncementHelper
 import org.wordpress.android.ui.reader.viewmodels.tagsfeed.ReaderTagsFeedUiStateMapper
 import org.wordpress.android.ui.reader.viewmodels.tagsfeed.ReaderTagsFeedViewModel
 import org.wordpress.android.ui.reader.viewmodels.tagsfeed.ReaderTagsFeedViewModel.ActionEvent
@@ -91,7 +91,7 @@ class ReaderTagsFeedViewModelTest : BaseUnitTest() {
     lateinit var networkUtilsWrapper: NetworkUtilsWrapper
 
     @Mock
-    lateinit var readerAnnouncementRepository: ReaderAnnouncementRepository
+    lateinit var readerAnnouncementHelper: ReaderAnnouncementHelper
 
     private lateinit var viewModel: ReaderTagsFeedViewModel
 
@@ -123,7 +123,7 @@ class ReaderTagsFeedViewModelTest : BaseUnitTest() {
             displayUtilsWrapper = displayUtilsWrapper,
             readerTracker = readerTracker,
             networkUtilsWrapper = networkUtilsWrapper,
-            readerAnnouncementRepository = readerAnnouncementRepository,
+            readerAnnouncementHelper = readerAnnouncementHelper,
         )
         whenever(readerPostCardActionsHandler.navigationEvents)
             .thenReturn(navigationEvents)
@@ -158,8 +158,8 @@ class ReaderTagsFeedViewModelTest : BaseUnitTest() {
         val tag = ReaderTestUtils.createTag("tag")
         val announcementItems = listOf<ReaderAnnouncementCardItemData>(mock(), mock())
         mockMapInitialTagFeedItems()
-        whenever(readerAnnouncementRepository.hasReaderAnnouncement()).thenReturn(true)
-        whenever(readerAnnouncementRepository.getReaderAnnouncementItems()).thenReturn(announcementItems)
+        whenever(readerAnnouncementHelper.hasReaderAnnouncement()).thenReturn(true)
+        whenever(readerAnnouncementHelper.getReaderAnnouncementItems()).thenReturn(announcementItems)
 
         // When
         viewModel.onTagsChanged(listOf(tag))
@@ -177,8 +177,8 @@ class ReaderTagsFeedViewModelTest : BaseUnitTest() {
         val tag = ReaderTestUtils.createTag("tag")
         val announcementItems = listOf<ReaderAnnouncementCardItemData>(mock(), mock())
         mockMapInitialTagFeedItems()
-        whenever(readerAnnouncementRepository.hasReaderAnnouncement()).thenReturn(true)
-        whenever(readerAnnouncementRepository.getReaderAnnouncementItems()).thenReturn(announcementItems)
+        whenever(readerAnnouncementHelper.hasReaderAnnouncement()).thenReturn(true)
+        whenever(readerAnnouncementHelper.getReaderAnnouncementItems()).thenReturn(announcementItems)
 
         viewModel.onTagsChanged(listOf(tag))
         advanceUntilIdle()
@@ -189,7 +189,7 @@ class ReaderTagsFeedViewModelTest : BaseUnitTest() {
         advanceUntilIdle()
 
         // Then
-        verify(readerAnnouncementRepository).dismissReaderAnnouncement()
+        verify(readerAnnouncementHelper).dismissReaderAnnouncement()
         assertThat(collectedUiStates.last()).isEqualTo(
             ReaderTagsFeedViewModel.UiState.Loaded(
                 data = listOf(getInitialTagFeedItem(tag)),