Skip to content

Remove unused code related to Avatar upload #21952

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

Merged
merged 1 commit into from
Jun 24, 2025
Merged

Remove unused code related to Avatar upload #21952

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
1 change: 0 additions & 1 deletion WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ android {
buildConfigField "boolean", "VOICE_TO_CONTENT", "false"
buildConfigField "boolean", "READER_FLOATING_BUTTON", "false"
buildConfigField "boolean", "ENABLE_SELF_HOSTED_USERS", "false"
buildConfigField "boolean", "GRAVATAR_QUICK_EDITOR", "false"

// Override these constants in jetpack product flavor to enable/ disable features
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
Expand Down
282 changes: 30 additions & 252 deletions WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.kt
View file
Open in desktop

Large diffs are not rendered by default.

206 changes: 2 additions & 204 deletions WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions ...Press/src/main/java/org/wordpress/android/util/config/GravatarQuickEditorFeatureConfig.kt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions WordPress/src/main/res/drawable/bg_wordpress_gravatar_sync_info.xml
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions WordPress/src/main/res/layout/gravatar_sync_info_banner.xml
View file
Open in desktop

This file was deleted.

54 changes: 11 additions & 43 deletions WordPress/src/main/res/layout/me_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,37 +43,18 @@
android:padding="@dimen/margin_large">

<FrameLayout
android:id="@+id/frame_avatar"
android:id="@+id/avatar_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<FrameLayout
android:id="@+id/avatar_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/me_profile_photo"
android:padding="@dimen/margin_small">

<ImageView
android:id="@+id/me_avatar"
android:layout_width="@dimen/avatar_sz_inner_circle"
android:layout_height="@dimen/avatar_sz_inner_circle"
android:contentDescription="@string/reader_avatar_desc" />
</FrameLayout>

<ProgressBar
android:id="@+id/avatar_progress"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/me_profile_photo"
android:padding="@dimen/margin_small">

<ImageView
android:id="@+id/me_avatar"
android:layout_width="@dimen/avatar_sz_inner_circle"
android:layout_height="@dimen/avatar_sz_inner_circle"
android:layout_gravity="center"
android:background="@drawable/bg_oval_black_translucent_50"
android:clickable="true"
android:focusable="true"
android:indeterminate="true"
android:padding="@dimen/margin_large"
android:visibility="gone"
tools:visibility="visible" />
android:contentDescription="@string/reader_avatar_desc" />
</FrameLayout>

<org.wordpress.android.widgets.WPTextView
Expand All @@ -82,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_extra_large"
android:layout_toEndOf="@+id/frame_avatar"
android:layout_toEndOf="@+id/avatar_container"
android:ellipsize="end"
android:maxLines="1"
app:autoSizeMaxTextSize="@dimen/my_site_name_label_single_line_text_size"
Expand All @@ -97,7 +78,7 @@
android:layout_marginStart="@dimen/margin_extra_large"
android:layout_marginBottom="@dimen/margin_extra_large"
android:layout_below="@id/me_display_name"
android:layout_toEndOf="@id/frame_avatar"
android:layout_toEndOf="@id/avatar_container"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceBody2"
Expand Down Expand Up @@ -480,17 +461,4 @@
</LinearLayout>
</androidx.core.widget.NestedScrollView>

<include
android:id="@+id/gravatar_sync_view"
layout="@layout/gravatar_sync_info_banner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_extra_large"
android:layout_marginBottom="@dimen/margin_extra_large"
android:visibility="gone"
android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="gone" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
4 changes: 0 additions & 4 deletions WordPress/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3013,8 +3013,6 @@
<string name="gravatar_info_title">Your WordPress.com profile is powered by Gravatar</string>
<string name="gravatar_info_description">Updating your avatar, name, and about info here will also update it across all sites that use Gravatar profiles.</string>
<string name="gravatar_info_learn_more_link">What is Gravatar?</string>
<string name="gravatar_info_sync_message">Updates might take some time to sync with your Gravatar profile.</string>
<string name="gravatar_info_sync_done_button">Done</string>


<!-- Self-hosted Users -->
Expand Down Expand Up @@ -3069,7 +3067,6 @@
<string name="error_cropping_image">Error cropping the image</string>
<string name="error_locating_image">Error locating the cropped image</string>
<string name="error_refreshing_gravatar">Error reloading your Gravatar</string>
<string name="error_updating_gravatar">Error updating your Gravatar</string>
<string name="avatar_update_email_unverified">To update your avatar, you need to verify your email address first.</string>
<string name="about_update_email_unverified">To update your profile, you need to verify your email address first.</string>

Expand Down Expand Up @@ -3296,7 +3293,6 @@

<!-- Signup -->
<string name="sign_up_label" tools:ignore="UnusedResources" a8c-src-lib="module:login">Sign Up</string>
<string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
<string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
<string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
<string name="signup_epilogue_error_button_negative">Revert</string>
Expand Down
2 changes: 0 additions & 2 deletions WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsTrackerNosaraTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ class AnalyticsTrackerNosaraTest {
Stat.PAGES_SEARCH_ACCESSED to "site_pages_search_accessed",
Stat.PAGES_EDIT_HOMEPAGE_INFO_PRESSED to "site_pages_edit_homepage_info_pressed",
Stat.PAGES_EDIT_HOMEPAGE_ITEM_PRESSED to "site_pages_edit_homepage_item_pressed",
Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED to "signup_email_epilogue_gallery_picked",
Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW to "signup_email_epilogue_shot_new",
Stat.SIGNUP_EMAIL_EPILOGUE_UNCHANGED to "signup_epilogue_unchanged",
Stat.SIGNUP_EMAIL_EPILOGUE_UPDATE_DISPLAY_NAME_FAILED to "signup_epilogue_update_display_name_failed",
Stat.SIGNUP_EMAIL_EPILOGUE_UPDATE_DISPLAY_NAME_SUCCEEDED to "signup_epilogue_update_display_name_succeeded",
Expand Down
6 changes: 0 additions & 6 deletions libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,6 @@ public enum Stat {
FOLLOWED_BLOG_NOTIFICATIONS_SETTINGS_COMMENTS_ON,
ME_ACCESSED("me_tab_accessed"),
ME_GRAVATAR_TAPPED,
ME_GRAVATAR_SHOT_NEW,
ME_GRAVATAR_GALLERY_PICKED,
ME_GRAVATAR_CROPPED,
ME_GRAVATAR_UPLOADED,
ME_GRAVATAR_UPLOAD_UNSUCCESSFUL,
ME_GRAVATAR_UPLOAD_EXCEPTION,
Expand Down Expand Up @@ -471,9 +468,6 @@ public enum Stat {
PAGES_EDIT_HOMEPAGE_ITEM_PRESSED("site_pages_edit_homepage_item_pressed"),
SIGNUP_BUTTON_TAPPED,
SIGNUP_EMAIL_BUTTON_TAPPED,
SIGNUP_EMAIL_EPILOGUE_GRAVATAR_CROPPED,
SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED("signup_email_epilogue_gallery_picked"),
SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW("signup_email_epilogue_shot_new"),
SIGNUP_EMAIL_EPILOGUE_UNCHANGED("signup_epilogue_unchanged"),
SIGNUP_EMAIL_EPILOGUE_UPDATE_DISPLAY_NAME_FAILED("signup_epilogue_update_display_name_failed"),
SIGNUP_EMAIL_EPILOGUE_UPDATE_DISPLAY_NAME_SUCCEEDED("signup_epilogue_update_display_name_succeeded"),
Expand Down