Show the combined scope when launching the QE

Author: AdamGrzybkowski

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

@@ -27,6 +27,7 @@ import com.gravatar.quickeditor.GravatarQuickEditor
 import com.gravatar.quickeditor.ui.editor.AboutEditorResult
 import com.gravatar.quickeditor.ui.editor.AboutInputField
 import com.gravatar.quickeditor.ui.editor.AuthenticationMethod
+import com.gravatar.quickeditor.ui.editor.AvatarPickerAndAboutEditorConfiguration
 import com.gravatar.quickeditor.ui.editor.AvatarPickerResult
 import com.gravatar.quickeditor.ui.editor.GravatarQuickEditorParams
 import com.gravatar.quickeditor.ui.editor.QuickEditorScopeOption
@@ -287,7 +288,7 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
     private fun MeFragmentBinding.showAvatarPicker() {
         withVeryfiedEmail(unverifiedEmailMessageRes = R.string.avatar_update_email_unverified) {
             if (gravatarQuickEditorFeatureConfig.isEnabled()) {
-                showQuickEditor(scope = QuickEditorScopeOption.avatarPicker())
+                showQuickEditor(page = AvatarPickerAndAboutEditorConfiguration.Page.AvatarPicker)
             } else {
                 showPhotoPickerForGravatar()
             }
@@ -296,27 +297,26 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
 
     private fun MeFragmentBinding.showProfileEditor() {
         withVeryfiedEmail(unverifiedEmailMessageRes = R.string.about_update_email_unverified) {
-            showQuickEditor(
-                scope = QuickEditorScopeOption.aboutEditor {
-                    fields = setOf(
-                        AboutInputField.FirstName,
-                        AboutInputField.LastName,
-                        AboutInputField.DisplayName,
-                        AboutInputField.AboutMe
-                    )
-                }
-            )
+            showQuickEditor(page = AvatarPickerAndAboutEditorConfiguration.Page.AboutEditor)
         }
     }
 
     private fun MeFragmentBinding.showQuickEditor(
-        scope: QuickEditorScopeOption
+        page: AvatarPickerAndAboutEditorConfiguration.Page
     ) {
         GravatarQuickEditor.show(
             fragment = this@MeFragment,
             gravatarQuickEditorParams = GravatarQuickEditorParams {
                 email = Email(accountStore.account.email)
-                scopeOption = scope
+                scopeOption = QuickEditorScopeOption.avatarAndAbout {
+                    initialPage = page
+                    fields = setOf(
+                        AboutInputField.FirstName,
+                        AboutInputField.LastName,
+                        AboutInputField.DisplayName,
+                        AboutInputField.AboutMe
+                    )
+                }
             },
             authenticationMethod = AuthenticationMethod.Bearer(accountStore.accessToken.orEmpty()),
             updateHandler = { event ->

gradle/libs.versions.toml

@@ -70,7 +70,7 @@ google-play-app-update = '2.1.0'
 google-play-review = '2.0.2'
 google-play-services-auth = '20.4.1'
 google-services = '4.4.2'
-gravatar = '2.5.0-rc2'
+gravatar = '2.5.0-rc3'
 greenrobot-eventbus = '3.3.1'
 gutenberg-kit = 'trunk-1b19fef4cb557afb9727497a441bb411cdb8895a'
 gutenberg-mobile = 'v1.121.0'