Merge pull request #18336 from wordpress-mobile/deps/update-dagger-to-2.45

ovitrif · web-flow · commit 3859a8bc436b · 2023-05-02T17:50:00.000+02:00
[Dependency Updates] Update `daggerVersion` to 2.45
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditViewModel.kt
@@ -103,30 +103,30 @@ class UnifiedCommentsEditViewModel @Inject constructor(
     }
 
     enum class FieldType(@StringRes val errorStringRes: Int, val isValid: (String) -> Boolean) {
-        USER_NAME(R.string.comment_edit_user_name_error, { isValidUserName(it) }),
-        USER_EMAIL(R.string.comment_edit_user_email_error, { isValidUserEmail(it) }),
-        WEB_ADDRESS(R.string.comment_edit_web_address_error, { isValidWebAddress(it) }),
-        COMMENT(R.string.comment_edit_comment_error, { isValidComment(it) });
+        USER_NAME(R.string.comment_edit_user_name_error, { Utilities.isValidUserName(it) }),
+        USER_EMAIL(R.string.comment_edit_user_email_error, { Utilities.isValidUserEmail(it) }),
+        WEB_ADDRESS(R.string.comment_edit_web_address_error, { Utilities.isValidWebAddress(it) }),
+        COMMENT(R.string.comment_edit_comment_error, { Utilities.isValidComment(it) });
 
         // This is here for testing purposes
         fun matches(expectedField: FieldType): Boolean {
             return this == expectedField
         }
 
-        companion object {
-            private fun isValidUserName(userName: String): Boolean {
+        private object Utilities {
+            fun isValidUserName(userName: String): Boolean {
                 return userName.isNotBlank()
             }
 
-            private fun isValidUserEmail(email: String): Boolean {
+            fun isValidUserEmail(email: String): Boolean {
                 return email.isBlank() || validateEmail(email)
             }
 
-            private fun isValidWebAddress(url: String): Boolean {
+            fun isValidWebAddress(url: String): Boolean {
                 return url.isBlank() || validateUrl(url)
             }
 
-            private fun isValidComment(comment: String): Boolean {
+            fun isValidComment(comment: String): Boolean {
                 return comment.isNotBlank()
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/JetpackMigrationFragment.kt
@@ -34,12 +34,12 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Content
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Error
 import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel.UiState.Loading
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.DeleteStep
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.DoneStep
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.ErrorStep
+import org.wordpress.android.ui.main.jetpack.migration.compose.state.deleteStep
+import org.wordpress.android.ui.main.jetpack.migration.compose.state.doneStep
+import org.wordpress.android.ui.main.jetpack.migration.compose.state.errorStep
 import org.wordpress.android.ui.main.jetpack.migration.compose.state.LoadingState
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.NotificationsStep
-import org.wordpress.android.ui.main.jetpack.migration.compose.state.WelcomeStep
+import org.wordpress.android.ui.main.jetpack.migration.compose.state.notificationsStep
+import org.wordpress.android.ui.main.jetpack.migration.compose.state.welcomeStep
 import org.wordpress.android.ui.utils.PreMigrationDeepLinkData
 import org.wordpress.android.util.AppThemeUtils
 import org.wordpress.android.util.LocaleManager
@@ -157,11 +157,11 @@ private fun JetpackMigrationScreen(viewModel: JetpackMigrationViewModel = viewMo
 
         Crossfade(targetState = uiState) { state ->
             when (state) {
-                is Content.Welcome -> WelcomeStep(state)
-                is Content.Notifications -> NotificationsStep(state)
-                is Content.Done -> DoneStep(state)
-                is Content.Delete -> DeleteStep(state)
-                is Error -> ErrorStep(state)
+                is Content.Welcome -> welcomeStep(state)
+                is Content.Notifications -> notificationsStep(state)
+                is Content.Done -> doneStep(state)
+                is Content.Delete -> deleteStep(state)
+                is Error -> errorStep(state)
                 is Loading -> LoadingState()
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/components/SiteList.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/components/SiteList.kt
@@ -60,13 +60,13 @@ fun SiteList(
             .then(blurModifier),
     ) {
         item {
-            SiteListHeader(uiState)
+            siteListHeader(uiState)
         }
         items(
             items = uiState.sites,
             key = { it.id },
         ) { site ->
-            SiteListItem(
+            siteListItem(
                 uiState = site,
                 isDimmed = uiState.isProcessing,
             )
@@ -86,7 +86,7 @@ fun SiteList(
 }
 
 @Composable
-private fun SiteListItem(uiState: SiteListItemUiState, isDimmed: Boolean) = with(uiState) {
+private fun siteListItem(uiState: SiteListItemUiState, isDimmed: Boolean) = with(uiState) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         modifier = Modifier
@@ -102,7 +102,7 @@ private fun SiteListItem(uiState: SiteListItemUiState, isDimmed: Boolean) = with
 }
 
 @Composable
-private fun SiteListHeader(uiState: UiState.Content.Welcome) = with(uiState) {
+private fun siteListHeader(uiState: UiState.Content.Welcome) = with(uiState) {
     Column(
         modifier = Modifier
             .dimmed(uiState.isProcessing)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/DeleteStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/DeleteStep.kt
@@ -37,7 +37,7 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
 import org.wordpress.android.ui.main.jetpack.migration.compose.components.ScreenIcon
 
 @Composable
-fun DeleteStep(uiState: UiState.Content.Delete) = with(uiState) {
+fun deleteStep(uiState: UiState.Content.Delete) = with(uiState) {
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -94,6 +94,6 @@ fun DeleteStep(uiState: UiState.Content.Delete) = with(uiState) {
 private fun PreviewDeleteStep() {
     AppTheme {
         val uiState = UiState.Content.Delete(DeletePrimaryButton {}, DeleteSecondaryButton {})
-        DeleteStep(uiState)
+        deleteStep(uiState)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/DoneStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/DoneStep.kt
@@ -35,7 +35,7 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
 import org.wordpress.android.ui.main.jetpack.migration.compose.components.ScreenIcon
 
 @Composable
-fun DoneStep(uiState: UiState.Content.Done) = with(uiState) {
+fun doneStep(uiState: UiState.Content.Done) = with(uiState) {
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -87,6 +87,6 @@ fun DoneStep(uiState: UiState.Content.Done) = with(uiState) {
 private fun PreviewDoneStep() {
     AppTheme {
         val uiState = UiState.Content.Done(DonePrimaryButton {})
-        DoneStep(uiState)
+        doneStep(uiState)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/ErrorStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/ErrorStep.kt
@@ -24,7 +24,7 @@ import org.wordpress.android.ui.main.jetpack.migration.compose.components.Screen
 import org.wordpress.android.ui.main.jetpack.migration.compose.dimmed
 
 @Composable
-fun ErrorStep(uiState: UiState.Error) = with(uiState) {
+fun errorStep(uiState: UiState.Error) = with(uiState) {
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -77,6 +77,6 @@ private fun PreviewErrorStep() {
             secondaryActionButton = ErrorSecondaryButton {},
             type = UiState.Error.Generic,
         )
-        ErrorStep(uiState)
+        errorStep(uiState)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/NotificationsStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/NotificationsStep.kt
@@ -21,7 +21,7 @@ import org.wordpress.android.ui.main.jetpack.migration.JetpackMigrationViewModel
 import org.wordpress.android.ui.main.jetpack.migration.compose.components.ScreenIcon
 
 @Composable
-fun NotificationsStep(uiState: UiState.Content.Notifications) = with(uiState) {
+fun notificationsStep(uiState: UiState.Content.Notifications) = with(uiState) {
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -52,6 +52,6 @@ fun NotificationsStep(uiState: UiState.Content.Notifications) = with(uiState) {
 private fun PreviewNotificationsStep() {
     AppTheme {
         val uiState = UiState.Content.Notifications(NotificationsPrimaryButton {})
-        NotificationsStep(uiState)
+        notificationsStep(uiState)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/WelcomeStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/migration/compose/state/WelcomeStep.kt
@@ -46,7 +46,7 @@ import org.wordpress.android.ui.main.jetpack.migration.compose.dimmed
 
 @Composable
 @SuppressLint("FrequentlyChangedStateReadInComposition")
-fun WelcomeStep(uiState: UiState.Content.Welcome) = with(uiState) {
+fun welcomeStep(uiState: UiState.Content.Welcome) = with(uiState) {
     Box {
         val listState = rememberLazyListState()
         val blurredListState = rememberLazyListState()
@@ -216,7 +216,7 @@ private val previewUiState = UiState.Content.Welcome(
 private fun PreviewWelcomeStep() {
     AppTheme {
         Box {
-            WelcomeStep(previewUiState)
+            welcomeStep(previewUiState)
         }
     }
 }
@@ -228,7 +228,7 @@ private fun PreviewWelcomeStepInProgress() {
     val uiState = previewUiState.copy(isProcessing = true)
     AppTheme {
         Box {
-            WelcomeStep(uiState)
+            welcomeStep(uiState)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/staticposter/JetpackStaticPosterFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/staticposter/JetpackStaticPosterFragment.kt
@@ -15,7 +15,7 @@ import org.wordpress.android.ui.ActivityLauncherWrapper
 import org.wordpress.android.ui.ActivityLauncherWrapper.Companion.JETPACK_PACKAGE_NAME
 import org.wordpress.android.ui.WPWebViewActivity
 import org.wordpress.android.ui.compose.theme.AppTheme
-import org.wordpress.android.ui.main.jetpack.staticposter.compose.JetpackStaticPoster
+import org.wordpress.android.ui.main.jetpack.staticposter.compose.jetpackStaticPoster
 import org.wordpress.android.util.UrlUtils
 import org.wordpress.android.util.extensions.getParcelableCompat
 import javax.inject.Inject
@@ -36,7 +36,7 @@ class JetpackStaticPosterFragment : Fragment() {
             AppTheme {
                 val uiState by viewModel.uiState.collectAsState()
                 when (val state = uiState) {
-                    is UiState.Content -> JetpackStaticPoster(
+                    is UiState.Content -> jetpackStaticPoster(
                         uiState = state,
                         onPrimaryClick = viewModel::onPrimaryClick,
                         onSecondaryClick = viewModel::onSecondaryClick,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/staticposter/compose/JetpackStaticPoster.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/jetpack/staticposter/compose/JetpackStaticPoster.kt
@@ -53,7 +53,7 @@ import org.wordpress.android.util.extensions.isRtl
 
 @Composable
 @SuppressLint("UnusedMaterialScaffoldPaddingParameter")
-fun JetpackStaticPoster(
+fun jetpackStaticPoster(
     uiState: UiState.Content,
     onPrimaryClick: () -> Unit = {},
     onSecondaryClick: () -> Unit = {},
@@ -147,7 +147,7 @@ private fun PreviewJetpackStaticPoster() {
     AppTheme {
         Box {
             val uiState = UiData.STATS.toContentUiState()
-            JetpackStaticPoster(uiState)
+            jetpackStaticPoster(uiState)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/QRCodeAuthFragment.kt
@@ -35,8 +35,8 @@ import org.wordpress.android.ui.qrcodeauth.QRCodeAuthUiState.Content
 import org.wordpress.android.ui.qrcodeauth.QRCodeAuthUiState.Error
 import org.wordpress.android.ui.qrcodeauth.QRCodeAuthUiState.Loading
 import org.wordpress.android.ui.qrcodeauth.QRCodeAuthUiState.Scanning
-import org.wordpress.android.ui.qrcodeauth.compose.state.ContentState
-import org.wordpress.android.ui.qrcodeauth.compose.state.ErrorState
+import org.wordpress.android.ui.qrcodeauth.compose.state.contentState
+import org.wordpress.android.ui.qrcodeauth.compose.state.errorState
 import org.wordpress.android.ui.qrcodeauth.compose.state.LoadingState
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.viewmodel.observeEvent
@@ -136,8 +136,8 @@ private fun QRCodeAuthScreen(viewModel: QRCodeAuthViewModel = viewModel()) {
 
         @Suppress("UnnecessaryVariable") // See: https://stackoverflow.com/a/69558316/4129245
         when (val state = uiState) {
-            is Content -> ContentState(state)
-            is Error -> ErrorState(state)
+            is Content -> contentState(state)
+            is Error -> errorState(state)
             is Loading -> LoadingState()
             is Scanning -> Unit
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ContentState.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ContentState.kt
@@ -30,7 +30,7 @@ import org.wordpress.android.ui.qrcodeauth.compose.components.Subtitle
 import org.wordpress.android.ui.qrcodeauth.compose.components.Title
 
 @Composable
-fun ContentState(uiState: QRCodeAuthUiState.Content) = with(uiState) {
+fun contentState(uiState: QRCodeAuthUiState.Content) = with(uiState) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
@@ -98,6 +98,6 @@ private fun ContentStatePreview() {
             primaryActionButton = ValidatedPrimaryActionButton {},
             secondaryActionButton = ValidatedSecondaryActionButton {},
         )
-        ContentState(state)
+        contentState(state)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ErrorState.kt b/WordPress/src/main/java/org/wordpress/android/ui/qrcodeauth/compose/state/ErrorState.kt
@@ -27,7 +27,7 @@ import org.wordpress.android.ui.qrcodeauth.compose.components.Subtitle
 import org.wordpress.android.ui.qrcodeauth.compose.components.Title
 
 @Composable
-fun ErrorState(uiState: QRCodeAuthUiState.Error) = with(uiState) {
+fun errorState(uiState: QRCodeAuthUiState.Error) = with(uiState) {
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
@@ -74,6 +74,6 @@ private fun ErrorStatePreview() {
             primaryActionButton = ErrorPrimaryActionButton {},
             secondaryActionButton = ErrorSecondaryActionButton {},
         )
-        ErrorState(state)
+        errorState(state)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt
@@ -6,6 +6,7 @@ import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.animation.ValueAnimator
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
@@ -81,6 +82,7 @@ class ReaderFollowButton @JvmOverloads constructor(
         setIsFollowed(isFollowed, true)
     }
 
+    @SuppressLint("Recycle")
     private fun setIsFollowed(isFollowed: Boolean, animateChanges: Boolean) {
         if (isFollowed == this.isFollowed && isSelected == isFollowed) {
             return
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt
@@ -13,7 +13,7 @@ import org.wordpress.android.ui.compose.theme.AppThemeWithoutBackground
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.New
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.Old
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel.ListItemUiState.Old.DomainUiState.AvailableDomain
-import org.wordpress.android.ui.sitecreation.domains.compose.DomainItem
+import org.wordpress.android.ui.sitecreation.domains.compose.domainItem
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.extensions.viewBinding
 
@@ -66,7 +66,7 @@ sealed class SiteCreationDomainViewHolder<T : ViewBinding>(protected val binding
         fun onBind(uiState: New.DomainUiState) = with(binding) {
             composeView.setContent {
                 AppThemeWithoutBackground {
-                    DomainItem(uiState)
+                    domainItem(uiState)
                 }
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/compose/DomainItem.kt
@@ -49,7 +49,7 @@ private val PrimaryFontSize = 17.sp
 private val StartPadding = 40.dp
 
 @Composable
-fun DomainItem(uiState: DomainUiState) = with(uiState) {
+fun domainItem(uiState: DomainUiState) = with(uiState) {
     Column(Modifier.background(if (isSelected) HighlightBgColor else Unspecified)) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
@@ -188,7 +188,7 @@ private fun DomainItemPreview() {
     }
     AppThemeWithoutBackground {
         Column {
-            uiStates.forEach { DomainItem(it) }
+            uiStates.forEach { domainItem(it) }
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.sitecreation.previews
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration.ORIENTATION_LANDSCAPE
 import android.os.Bundle
@@ -164,6 +165,7 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
     private fun SiteCreationPreviewScreenDefaultBinding.animateContentTransition() {
         contentLayout.addOnLayoutChangeListener(
             object : OnLayoutChangeListener {
+                @SuppressLint("Recycle")
                 override fun onLayoutChange(
                     v: View?,
                     left: Int,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/progress/SiteCreationProgressFragment.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.sitecreation.progress
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.view.View
@@ -131,6 +132,7 @@ class SiteCreationProgressFragment : Fragment(R.layout.site_creation_progress_sc
         }
     }
 
+    @SuppressLint("Recycle")
     private fun SiteCreationProgressCreatingSiteBinding.updateLoadingTextWithFadeAnimation(newText: CharSequence) {
         val animationDuration = AniUtils.Duration.SHORT
         val fadeOut = AniUtils.getFadeOutAnim(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsConnectJetpackActivity.kt
@@ -43,7 +43,7 @@ class StatsConnectJetpackActivity : LocaleAwareActivity() {
         initDagger()
         with(StatsJetpackConnectionActivityBinding.inflate(layoutInflater)) {
             setContentView(root)
-            setActionBar()
+            initActionBar()
             setTitle(string.stats)
             checkAndContinueJetpackConnectionFlow(savedInstanceState)
             initViews()
@@ -54,7 +54,7 @@ class StatsConnectJetpackActivity : LocaleAwareActivity() {
         (application as WordPress).component().inject(this)
     }
 
-    private fun StatsJetpackConnectionActivityBinding.setActionBar() {
+    private fun StatsJetpackConnectionActivityBinding.initActionBar() {
         setSupportActionBar(toolbarLayout.toolbarMain)
         val actionBar = supportActionBar
         if (actionBar != null) {
diff --git a/build.gradle b/build.gradle
diff --git a/settings.gradle b/settings.gradle

Original file line number	Diff line number	Diff line change
`@@ -103,30 +103,30 @@ class UnifiedCommentsEditViewModel @Inject constructor(`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`enum class FieldType(@StringRes val errorStringRes: Int, val isValid: (String) -> Boolean) {`
`106`		`- USER_NAME(R.string.comment_edit_user_name_error, { isValidUserName(it) }),`
`107`		`- USER_EMAIL(R.string.comment_edit_user_email_error, { isValidUserEmail(it) }),`
`108`		`- WEB_ADDRESS(R.string.comment_edit_web_address_error, { isValidWebAddress(it) }),`
`109`		`- COMMENT(R.string.comment_edit_comment_error, { isValidComment(it) });`
	`106`	`+ USER_NAME(R.string.comment_edit_user_name_error, { Utilities.isValidUserName(it) }),`
	`107`	`+ USER_EMAIL(R.string.comment_edit_user_email_error, { Utilities.isValidUserEmail(it) }),`
	`108`	`+ WEB_ADDRESS(R.string.comment_edit_web_address_error, { Utilities.isValidWebAddress(it) }),`
	`109`	`+ COMMENT(R.string.comment_edit_comment_error, { Utilities.isValidComment(it) });`
`110`	`110`
`111`	`111`	`// This is here for testing purposes`
`112`	`112`	`fun matches(expectedField: FieldType): Boolean {`
`113`	`113`	`return this == expectedField`
`114`	`114`	`}`
`115`	`115`
`116`		`- companion object {`
`117`		`- private fun isValidUserName(userName: String): Boolean {`
	`116`	`+ private object Utilities {`
	`117`	`+ fun isValidUserName(userName: String): Boolean {`
`118`	`118`	`return userName.isNotBlank()`
`119`	`119`	`}`
`120`	`120`
`121`		`- private fun isValidUserEmail(email: String): Boolean {`
	`121`	`+ fun isValidUserEmail(email: String): Boolean {`
`122`	`122`	`return email.isBlank() \|\| validateEmail(email)`
`123`	`123`	`}`
`124`	`124`
`125`		`- private fun isValidWebAddress(url: String): Boolean {`
	`125`	`+ fun isValidWebAddress(url: String): Boolean {`
`126`	`126`	`return url.isBlank() \|\| validateUrl(url)`
`127`	`127`	`}`
`128`	`128`
`129`		`- private fun isValidComment(comment: String): Boolean {`
	`129`	`+ fun isValidComment(comment: String): Boolean {`
`130`	`130`	`return comment.isNotBlank()`
`131`	`131`	`}`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import org.wordpress.android.ui.main.jetpack.migration.compose.components.Screen`
`24`	`24`	`import org.wordpress.android.ui.main.jetpack.migration.compose.dimmed`
`25`	`25`
`26`	`26`	`@Composable`
`27`		`-fun ErrorStep(uiState: UiState.Error) = with(uiState) {`
	`27`	`+fun errorStep(uiState: UiState.Error) = with(uiState) {`
`28`	`28`	`Column(`
`29`	`29`	`modifier = Modifier.fillMaxSize()`
`30`	`30`	`) {`
`@@ -77,6 +77,6 @@ private fun PreviewErrorStep() {`
`77`	`77`	`secondaryActionButton = ErrorSecondaryButton {},`
`78`	`78`	`type = UiState.Error.Generic,`
`79`	`79`	`)`
`80`		`- ErrorStep(uiState)`
	`80`	`+ errorStep(uiState)`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import org.wordpress.android.ui.main.jetpack.migration.compose.dimmed`
`46`	`46`
`47`	`47`	`@Composable`
`48`	`48`	`@SuppressLint("FrequentlyChangedStateReadInComposition")`
`49`		`-fun WelcomeStep(uiState: UiState.Content.Welcome) = with(uiState) {`
	`49`	`+fun welcomeStep(uiState: UiState.Content.Welcome) = with(uiState) {`
`50`	`50`	`Box {`
`51`	`51`	`val listState = rememberLazyListState()`
`52`	`52`	`val blurredListState = rememberLazyListState()`
`@@ -216,7 +216,7 @@ private val previewUiState = UiState.Content.Welcome(`
`216`	`216`	`private fun PreviewWelcomeStep() {`
`217`	`217`	`AppTheme {`
`218`	`218`	`Box {`
`219`		`- WelcomeStep(previewUiState)`
	`219`	`+ welcomeStep(previewUiState)`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`	`}`
`@@ -228,7 +228,7 @@ private fun PreviewWelcomeStepInProgress() {`
`228`	`228`	`val uiState = previewUiState.copy(isProcessing = true)`
`229`	`229`	`AppTheme {`
`230`	`230`	`Box {`
`231`		`- WelcomeStep(uiState)`
	`231`	`+ welcomeStep(uiState)`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ import org.wordpress.android.util.extensions.isRtl`
`53`	`53`
`54`	`54`	`@Composable`
`55`	`55`	`@SuppressLint("UnusedMaterialScaffoldPaddingParameter")`
`56`		`-fun JetpackStaticPoster(`
	`56`	`+fun jetpackStaticPoster(`
`57`	`57`	`uiState: UiState.Content,`
`58`	`58`	`onPrimaryClick: () -> Unit = {},`
`59`	`59`	`onSecondaryClick: () -> Unit = {},`
`@@ -147,7 +147,7 @@ private fun PreviewJetpackStaticPoster() {`
`147`	`147`	`AppTheme {`
`148`	`148`	`Box {`
`149`	`149`	`val uiState = UiData.STATS.toContentUiState()`
`150`		`- JetpackStaticPoster(uiState)`
	`150`	`+ jetpackStaticPoster(uiState)`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`	`}`