Skip to content

Convert GutenbergKitSettingsBuilder to injectable class #22836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkmassel wants to merge 1 commit into
base: jkmassel/editor-capability-resolver
Choose a base branch
from
Open

Convert GutenbergKitSettingsBuilder to injectable class #22836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 0 additions & 117 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditorConfigurationBuilder.kt
View file
Open in desktop

This file was deleted.

60 changes: 30 additions & 30 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ import org.wordpress.android.fluxc.model.PostModel
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.fluxc.model.post.PostStatus
import org.wordpress.android.fluxc.network.UserAgent
import org.wordpress.gutenberg.model.EditorConfiguration
import org.wordpress.android.fluxc.network.rest.wpcom.site.PrivateAtomicCookie
import org.wordpress.android.fluxc.store.AccountStore
import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged
Expand Down Expand Up @@ -208,7 +209,6 @@ import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
import org.wordpress.android.util.analytics.AnalyticsUtils
import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource
import org.wordpress.android.util.config.ContactSupportFeatureConfig
import org.wordpress.android.util.config.GutenbergKitPluginsFeature
import org.wordpress.android.util.config.PostConflictResolutionFeatureConfig
import org.wordpress.android.util.extensions.setLiftOnScrollTargetViewIdAndRequestLayout
import org.wordpress.android.util.helpers.MediaFile
Expand Down Expand Up @@ -381,8 +381,6 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene

@Inject lateinit var postConflictResolutionFeatureConfig: PostConflictResolutionFeatureConfig

@Inject lateinit var gutenbergKitPluginsFeature: GutenbergKitPluginsFeature

@Inject lateinit var activityNavigator: ActivityNavigator

@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
Expand All @@ -391,6 +389,7 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
@Inject lateinit var editorBloggingPromptsViewModel: EditorBloggingPromptsViewModel
@Inject lateinit var editorJetpackSocialViewModel: EditorJetpackSocialViewModel
@Inject lateinit var gutenbergKitNetworkLogger: GutenbergKitNetworkLogger
@Inject lateinit var gutenbergKitSettingsBuilder: GutenbergKitSettingsBuilder
private lateinit var editPostNavigationViewModel: EditPostNavigationViewModel
private lateinit var editPostSettingsViewModel: EditPostSettingsViewModel
private lateinit var prepublishingViewModel: PrepublishingViewModel
Expand Down Expand Up @@ -2208,36 +2207,37 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
onXpostsSettingsCapability(isXpostsCapable)
}

val siteConfig = GutenbergKitSettingsBuilder.SiteConfig.fromSiteModel(siteModel)
val postConfig = GutenbergKitSettingsBuilder.PostConfig.fromPostModel(
editPostRepository.getPost()
)
val featureConfig = GutenbergKitSettingsBuilder.FeatureConfig(
isPluginsFeatureEnabled = gutenbergKitPluginsFeature.isEnabled(),
isThemeStylesFeatureEnabled = siteSettings?.useThemeStyles ?: true,
isNetworkLoggingEnabled = AppPrefs.isTrackNetworkRequestsEnabled()
)
val appConfig = GutenbergKitSettingsBuilder.AppConfig(
accessToken = accountStore.accessToken,
locale = perAppLocaleManager.getCurrentLocaleLanguageCode(),
cookies = editPostAuthViewModel.getCookiesForPrivateSites(
site, privateAtomicCookie
),
accountUserId = accountStore.account.userId,
accountUserName = accountStore.account.userName,
userAgent = userAgent,
isJetpackSsoEnabled = isJetpackSsoEnabled
)
val post = editPostRepository.getPost()
val configuration = buildEditorConfiguration(siteModel, post)

val settings = GutenbergKitSettingsBuilder.buildSettings(
siteConfig = siteConfig,
postConfig = postConfig,
appConfig = appConfig,
featureConfig = featureConfig
return GutenbergKitEditorFragment.newInstance(configuration)
}

private fun buildEditorConfiguration(
site: SiteModel,
post: PostImmutableModel?
): EditorConfiguration {
val base = gutenbergKitSettingsBuilder.buildPostConfiguration(
site = site,
post = post,
accessToken = accountStore.accessToken
)
val configuration = EditorConfigurationBuilder.build(settings)

return GutenbergKitEditorFragment.newInstance(configuration)
val locale = perAppLocaleManager
.getCurrentLocaleLanguageCode()
.replace("_", "-").lowercase()

return base.toBuilder()
.setLocale(locale)
.setCookies(
editPostAuthViewModel.getCookiesForPrivateSites(
site, privateAtomicCookie
)
)
.setEnableNetworkLogging(
AppPrefs.isTrackNetworkRequestsEnabled()
)
.build()
}

override fun instantiateItem(container: ViewGroup, position: Int): Any {
Expand Down
Loading
Loading