Merge pull request #18385 from wordpress-mobile/issue/18368-detect-block-based-themes-page-list

[Pages List] Detect block-based theme on PageListViewModel

Author: RenanLukas

WordPress/src/main/java/org/wordpress/android/ui/mysite/SelectedSiteRepository.kt

@@ -4,11 +4,14 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.distinctUntilChanged
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.EditorThemeActionBuilder
 import org.wordpress.android.fluxc.generated.SiteActionBuilder
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.EditorThemeStore
 import org.wordpress.android.ui.prefs.AppPrefs
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
+import org.wordpress.android.util.config.GlobalStyleSupportFeatureConfig
 import org.wordpress.android.util.map
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,14 +20,16 @@ import javax.inject.Singleton
 class SelectedSiteRepository @Inject constructor(
     private val dispatcher: Dispatcher,
     private val siteSettingsInterfaceFactory: SiteSettingsInterfaceWrapper.Factory,
-    private val appPrefsWrapper: AppPrefsWrapper
+    private val appPrefsWrapper: AppPrefsWrapper,
+    private val globalStyleSupportFeatureConfig: GlobalStyleSupportFeatureConfig,
 ) {
     private var siteSettings: SiteSettingsInterfaceWrapper? = null
     private val _selectedSiteChange = MutableLiveData<SiteModel?>(null)
     private val _showSiteIconProgressBar = MutableLiveData<Boolean>()
     val selectedSiteChange = _selectedSiteChange as LiveData<SiteModel?>
     val siteSelected = _selectedSiteChange.map { it?.id }.distinctUntilChanged()
     val showSiteIconProgressBar = _showSiteIconProgressBar as LiveData<Boolean>
+
     fun updateSite(selectedSite: SiteModel) {
         if (getSelectedSite()?.iconUrl != selectedSite.iconUrl) {
             showSiteIconProgressBar(false)
@@ -79,6 +84,12 @@ class SelectedSiteRepository @Inject constructor(
         getSelectedSite()?.id ?: UNAVAILABLE
     }
 
+    private fun fetchEditorTheme(site: SiteModel) {
+        EditorThemeStore.FetchEditorThemePayload(site, globalStyleSupportFeatureConfig.isEnabled()).let {
+            dispatcher.dispatch(EditorThemeActionBuilder.newFetchEditorThemeAction(it))
+        }
+    }
+
     fun updateSiteSettingsIfNecessary() {
         // If the selected site is null, we can't update its site settings
         val selectedSite = getSelectedSite() ?: return
@@ -104,6 +115,8 @@ class SelectedSiteRepository @Inject constructor(
 
             siteSettings?.init(true)
         }
+        // Fetch editor theme to update block-based-theme flag
+        fetchEditorTheme(selectedSite)
     }
 
     fun isSiteIconUploadInProgress(): Boolean {

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -3718,7 +3718,7 @@ public void onEditorThemeChanged(OnEditorThemeChanged event) {
                     .onEditorThemeUpdated(editorThemeSupport.toBundle());
 
         mPostEditorAnalyticsSession
-                .editorSettingsFetched(editorThemeSupport.isFSETheme(), event.getEndpoint().getValue());
+                .editorSettingsFetched(editorThemeSupport.isBlockBasedTheme(), event.getEndpoint().getValue());
     }
     // EditPostActivityHook methods
 

WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java

@@ -32,7 +32,7 @@ public class PostEditorAnalyticsSession implements Serializable {
     private static final String KEY_SESSION_ID = "session_id";
     private static final String KEY_STARTUP_TIME = "startup_time_ms";
     private static final String KEY_TEMPLATE = "template";
-    private static final String KEY_FULL_SITE_EDITING = "full_site_editing";
+    private static final String KEY_IS_BLOCK_BASED_THEME = "is_block_based_theme";
     private static final String KEY_ENDPOINT = "endpoint";
     private static final String KEY_ENTRY_POINT = "entry_point";
 
@@ -177,9 +177,9 @@ public void applyTemplate(String template) {
                 properties);
     }
 
-    public void editorSettingsFetched(Boolean fullSiteEditing, String endpoint) {
+    public void editorSettingsFetched(Boolean isBlockBasedTheme, String endpoint) {
         final Map<String, Object> properties = getCommonProperties();
-        properties.put(KEY_FULL_SITE_EDITING, fullSiteEditing);
+        properties.put(KEY_IS_BLOCK_BASED_THEME, isBlockBasedTheme);
         properties.put(KEY_ENDPOINT, endpoint);
         AnalyticsUtils
                 .trackWithSiteDetails(mAnalyticsTrackerWrapper, Stat.EDITOR_SETTINGS_FETCHED, mSiteModel, properties);

WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt

@@ -7,16 +7,21 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableStateFlow
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.EditorThemeActionBuilder
 import org.wordpress.android.fluxc.generated.MediaActionBuilder
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
 import org.wordpress.android.fluxc.model.MediaModel
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus
 import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.EditorThemeStore
+import org.wordpress.android.fluxc.store.EditorThemeStore.FetchEditorThemePayload
+import org.wordpress.android.fluxc.store.EditorThemeStore.OnEditorThemeChanged
 import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.fluxc.store.MediaStore.MediaPayload
 import org.wordpress.android.fluxc.store.MediaStore.OnMediaChanged
@@ -36,6 +41,7 @@ import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.config.GlobalStyleSupportFeatureConfig
 import org.wordpress.android.util.extensions.toFormattedDateString
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
@@ -60,7 +66,9 @@ class PageListViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     private val localeManagerWrapper: LocaleManagerWrapper,
     private val accountStore: AccountStore,
-    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher
+    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher,
+    private val globalStyleSupportFeatureConfig: GlobalStyleSupportFeatureConfig,
+    private val editorThemeStore: EditorThemeStore,
 ) : ScopedViewModel(coroutineDispatcher) {
     private val _pages: MutableLiveData<List<PageItem>> = MutableLiveData()
     val pages: LiveData<Triple<List<PageItem>, Boolean, Boolean>> = Transformations.map(_pages) {
@@ -71,6 +79,7 @@ class PageListViewModel @Inject constructor(
     private var retryScrollToPage: LocalId? = null
     private var isStarted: Boolean = false
     private lateinit var listType: PageListType
+    private val isBlockBasedTheme = MutableStateFlow(false)
 
     private lateinit var pagesViewModel: PagesViewModel
 
@@ -136,6 +145,27 @@ class PageListViewModel @Inject constructor(
             pagesViewModel.blazeSiteEligibility.observeForever(blazeSiteEligibilityObserver)
 
             dispatcher.register(this)
+
+            refreshEditorTheme()
+        }
+    }
+
+    private fun refreshEditorTheme() {
+        // Get isBlockBasedTheme (cached) value from local db
+        isBlockBasedTheme.value = editorThemeStore.getIsBlockBasedTheme(pagesViewModel.site)
+
+        // Dispatch action to refresh the values from the remote
+        FetchEditorThemePayload(pagesViewModel.site, globalStyleSupportFeatureConfig.isEnabled()).let {
+            dispatcher.dispatch(EditorThemeActionBuilder.newFetchEditorThemeAction(it))
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN_ORDERED)
+    fun onEditorThemeChanged(event: OnEditorThemeChanged) {
+        if (pagesViewModel.site.id == event.siteId) {
+            event.editorTheme?.themeSupport?.let { themeSupport ->
+                isBlockBasedTheme.value = themeSupport.isEditorThemeBlockBased()
+            }
         }
     }
 

WordPress/src/test/java/org/wordpress/android/ui/mysite/SelectedSiteRepositoryTest.kt

@@ -15,11 +15,13 @@ import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.EditorThemeAction
 import org.wordpress.android.fluxc.action.SiteAction
 import org.wordpress.android.fluxc.annotations.action.Action
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
+import org.wordpress.android.util.config.GlobalStyleSupportFeatureConfig
 
 @ExperimentalCoroutinesApi
 class SelectedSiteRepositoryTest : BaseUnitTest() {
@@ -34,6 +36,10 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
 
     @Mock
     lateinit var appPrefsWrapper: AppPrefsWrapper
+
+    @Mock
+    lateinit var globalStyleSupportFeatureConfig: GlobalStyleSupportFeatureConfig
+
     private lateinit var siteModel: SiteModel
     private var siteIconProgressBarVisible: Boolean = false
     private var selectedSite: SiteModel? = null
@@ -46,7 +52,12 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
 
     @Before
     fun setUp() {
-        selectedSiteRepository = SelectedSiteRepository(dispatcher, siteSettingsInterfaceFactory, appPrefsWrapper)
+        selectedSiteRepository = SelectedSiteRepository(
+            dispatcher,
+            siteSettingsInterfaceFactory,
+            appPrefsWrapper,
+            globalStyleSupportFeatureConfig
+        )
         selectedSiteRepository.showSiteIconProgressBar.observeForever { siteIconProgressBarVisible = it == true }
         selectedSiteRepository.selectedSiteChange.observeForever { selectedSite = it }
         siteModel = SiteModel()
@@ -117,7 +128,6 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
         selectedSiteRepository.updateTitle(updatedTitle)
 
         assertThat(siteModel.name).isEqualTo(updatedTitle)
-        verify(dispatcher).dispatch(any())
         assertThat(actions.last().payload).isEqualTo(siteModel)
         assertThat(actions.last().type).isEqualTo(SiteAction.UPDATE_SITE)
 
@@ -218,6 +228,15 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
         assertThat(emptySiteIdEmitted).isTrue
     }
 
+    @Test
+    fun `Should fetch EditorTheme when updateSiteSettingsIfNecessary is called`() {
+        initializeSiteAndSiteSettings()
+
+        selectedSiteRepository.updateSiteSettingsIfNecessary()
+
+        assertThat(actions.last().type).isEqualTo(EditorThemeAction.FETCH_EDITOR_THEME)
+    }
+
     private fun initializeSiteAndSiteSettings() {
         selectedSiteRepository.updateSite(siteModel)
         doAnswer {

WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt

@@ -8,10 +8,15 @@ import org.junit.Test
 import org.mockito.Mock
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.EditorThemeAction
+import org.wordpress.android.fluxc.annotations.action.Action
 import org.wordpress.android.fluxc.model.AccountModel
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
 import org.wordpress.android.fluxc.model.PostModel
@@ -20,6 +25,7 @@ import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus
 import org.wordpress.android.fluxc.model.post.PostStatus
 import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.EditorThemeStore
 import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Divider
@@ -30,6 +36,7 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.AuthorFilterSelection.EVERYONE
 import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
 import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.config.GlobalStyleSupportFeatureConfig
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBLISHED
 import org.wordpress.android.viewmodel.pages.PostModelUploadUiStateUseCase.PostUploadUiState
@@ -68,9 +75,16 @@ class PageListViewModelTest : BaseUnitTest() {
     @Mock
     lateinit var accountStore: AccountStore
 
+    @Mock
+    lateinit var globalStyleSupportFeatureConfig: GlobalStyleSupportFeatureConfig
+
+    @Mock
+    lateinit var editorThemeStore: EditorThemeStore
+
     private lateinit var viewModel: PageListViewModel
     private val site = SiteModel()
     private val pageListState = MutableLiveData<PageListState>()
+    private lateinit var actions: MutableList<Action<*>>
 
     @Before
     fun setUp() {
@@ -83,7 +97,9 @@ class PageListViewModelTest : BaseUnitTest() {
             dispatcher,
             localeManagerWrapper,
             accountStore,
-            testDispatcher()
+            testDispatcher(),
+            globalStyleSupportFeatureConfig,
+            editorThemeStore,
         )
 
         whenever(pageItemProgressUiStateUseCase.getProgressStateForPage(any())).thenReturn(
@@ -115,6 +131,11 @@ class PageListViewModelTest : BaseUnitTest() {
 
         val blazeSiteEligibility = MutableLiveData<Boolean>()
         whenever(pagesViewModel.blazeSiteEligibility).thenReturn(blazeSiteEligibility)
+
+        doAnswer {
+            actions.add(it.getArgument(0))
+        }.whenever(dispatcher).dispatch(any())
+        actions = mutableListOf()
     }
 
     @Test
@@ -475,6 +496,22 @@ class PageListViewModelTest : BaseUnitTest() {
         assertThat(pageItem.author).isNull()
     }
 
+    @Test
+    fun `Should refresh EditorTheme when start is called the first time`() {
+        val pages = MutableLiveData<List<PageModel>>()
+        whenever(pagesViewModel.pages).thenReturn(pages)
+        viewModel.start(PUBLISHED, pagesViewModel)
+        assertThat(actions.last().type).isEqualTo(EditorThemeAction.FETCH_EDITOR_THEME)
+    }
+
+    @Test
+    fun `Should call EditorThemeStore getIsBlockBasedTheme when start is called the first time`() {
+        val pages = MutableLiveData<List<PageModel>>()
+        whenever(pagesViewModel.pages).thenReturn(pages)
+        viewModel.start(PUBLISHED, pagesViewModel)
+        verify(editorThemeStore).getIsBlockBasedTheme(site)
+    }
+
     private fun buildPageModel(
         id: Int,
         date: Date = Date(0),

build.gradle

@@ -22,7 +22,7 @@ ext {
     automatticTracksVersion = '2.2.0'
     gutenbergMobileVersion = 'v1.95.0-alpha1'
     wordPressAztecVersion = 'v1.6.3'
-    wordPressFluxCVersion = 'trunk-2d2bf4a52d3d1bcc434529a3700213c376206f7f'
+    wordPressFluxCVersion = 'trunk-7d44ea7eecabc32200d900b8065760964de04d10'
     wordPressLoginVersion = '1.3.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.6.1'