diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeServiceIcon.kt b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeServiceIcon.kt
index cf8ec1ef63fd..bb0d85799459 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeServiceIcon.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeServiceIcon.kt
@@ -16,10 +16,13 @@ enum class PublicizeServiceIcon(
val serviceId: String,
@DrawableRes val iconResId: Int,
) {
+ BLUESKY("bluesky", R.drawable.ic_social_bluesky),
FACEBOOK("facebook", R.drawable.ic_social_facebook),
INSTAGRAM("instagram-business", R.drawable.ic_social_instagram),
LINKEDIN("linkedin", R.drawable.ic_social_linkedin),
MASTODON("mastodon", R.drawable.ic_social_mastodon),
+ NEXTDOOR("nextdoor", R.drawable.ic_social_nextdoor),
+ THREADS("threads", R.drawable.ic_social_threads),
TUMBLR("tumblr", R.drawable.ic_social_tumblr),
TWITTER("twitter", R.drawable.ic_social_twitter);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeServiceAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeServiceAdapter.java
index ac96645bb672..d36d934aab90 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeServiceAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/adapters/PublicizeServiceAdapter.java
@@ -106,14 +106,19 @@ public void onBindViewHolder(final SharingViewHolder holder, int position) {
holder.mTxtService.setText(service.getLabel());
final PublicizeServiceIcon icon = PublicizeServiceIcon.fromServiceId(service.getId());
if (icon != null) {
- holder.mImgIcon.setVisibility(View.VISIBLE);
mImageManager.load(holder.mImgIcon, icon.getIconResId());
} else {
- holder.mImgIcon.setVisibility(View.INVISIBLE);
+ holder.mImgIcon.setImageResource(R.drawable.ic_social_generic);
}
+
if (connections.size() > 0) {
- holder.mTxtUser.setText(connections.getUserDisplayNames());
- holder.mTxtUser.setVisibility(View.VISIBLE);
+ String userNames = connections.getUserDisplayNames();
+ if (userNames.isEmpty()) {
+ holder.mTxtUser.setVisibility(View.GONE);
+ } else {
+ holder.mTxtUser.setText(connections.getUserDisplayNames());
+ holder.mTxtUser.setVisibility(View.VISIBLE);
+ }
holder.mImgIcon.clearColorFilter();
holder.mImgIcon.setImageAlpha(255);
} else {
@@ -200,6 +205,7 @@ protected Boolean doInBackground(Void... params) {
return !(mTmpServices.isSameAs(mServices) && mTmpConnections.isSameAs(mConnections));
}
+ @SuppressLint("NotifyDataSetChanged")
@Override
protected void onPostExecute(Boolean result) {
if (result) {
diff --git a/WordPress/src/main/res/drawable-night/ic_social_threads.xml b/WordPress/src/main/res/drawable-night/ic_social_threads.xml
new file mode 100644
index 000000000000..42f4ad58cdf9
--- /dev/null
+++ b/WordPress/src/main/res/drawable-night/ic_social_threads.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/WordPress/src/main/res/drawable/ic_social_bluesky.xml b/WordPress/src/main/res/drawable/ic_social_bluesky.xml
new file mode 100644
index 000000000000..d0cc139dca60
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_social_bluesky.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/WordPress/src/main/res/drawable/ic_social_generic.xml b/WordPress/src/main/res/drawable/ic_social_generic.xml
new file mode 100644
index 000000000000..f6a36090353b
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_social_generic.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/WordPress/src/main/res/drawable/ic_social_nextdoor.xml b/WordPress/src/main/res/drawable/ic_social_nextdoor.xml
new file mode 100644
index 000000000000..0d6b199c546c
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_social_nextdoor.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/WordPress/src/main/res/drawable/ic_social_threads.xml b/WordPress/src/main/res/drawable/ic_social_threads.xml
new file mode 100644
index 000000000000..aad5a4676c3b
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_social_threads.xml
@@ -0,0 +1,13 @@
+
+
+