Merge pull request #17193 from wordpress-mobile/release/20.8

Merge release branch after 20.8-rc-2 beta

Author: AliSoftware

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsViewModel.kt

@@ -43,7 +43,9 @@ class EditPostPublishSettingsViewModel @Inject constructor(
 
         postRepository?.let {
             val site = siteStore.getSiteByLocalId(it.localSiteId) ?: return@let
-            fetchAuthors(site)
+            if (site.hasCapabilityListUsers) {
+                fetchAuthors(site)
+            }
         }
     }
 

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java

@@ -111,6 +111,8 @@ public class EditPostSettingsFragment extends Fragment {
     private TextView mStatusTextView;
     private TextView mPostFormatTextView;
     private TextView mPasswordTextView;
+    private View mPostAuthorDivider;
+    private LinearLayout mPostAuthorContainer;
     private TextView mAuthorTextView;
     private TextView mPublishDateTextView;
     private TextView mPublishDateTitleTextView;
@@ -261,6 +263,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         mStatusTextView = rootView.findViewById(R.id.post_status);
         mPostFormatTextView = rootView.findViewById(R.id.post_format);
         mPasswordTextView = rootView.findViewById(R.id.post_password);
+        mPostAuthorDivider = rootView.findViewById(R.id.post_author_divider);
+        mPostAuthorContainer = rootView.findViewById(R.id.post_author_container);
         mAuthorTextView = rootView.findViewById(R.id.post_author);
         mPublishDateTextView = rootView.findViewById(R.id.publish_date);
         mPublishDateTitleTextView = rootView.findViewById(R.id.publish_date_title);
@@ -367,8 +371,7 @@ public void onClick(View view) {
             }
         });
 
-        final LinearLayout authorContainer = rootView.findViewById(R.id.post_author_container);
-        authorContainer.setOnClickListener(view -> showAuthorDialog());
+        mPostAuthorContainer.setOnClickListener(view -> showAuthorDialog());
 
         mStickySwitch.setOnCheckedChangeListener(mOnStickySwitchChangeListener);
 
@@ -948,19 +951,24 @@ private void updatePublishDateTextView(String label, PostImmutableModel postImmu
     }
 
     private void updateAuthorTextView(String authorDisplayName) {
-        if (authorDisplayName == null) {
-            // If the authorDisplayName is null, that means this is a new unpublished post.
-            // Set author to the current user name.
-            EditPostRepository editPostRepository = getEditPostRepository();
-            if (editPostRepository == null) {
-                return;
-            }
-            PostImmutableModel postModel = editPostRepository.getPost();
-            if (postModel != null && postModel.getAuthorDisplayName() == null) {
-                updateAuthorTextView(mAccountStore.getAccount().getDisplayName());
+        if (getSite() != null && getSite().getHasCapabilityListUsers()) {
+            mPostAuthorDivider.setVisibility(View.VISIBLE);
+            mPostAuthorContainer.setVisibility(View.VISIBLE);
+
+            if (authorDisplayName == null) {
+                // If the authorDisplayName is null, that means this is a new unpublished post.
+                // Set author to the current user name.
+                EditPostRepository editPostRepository = getEditPostRepository();
+                if (editPostRepository == null) {
+                    return;
+                }
+                PostImmutableModel postModel = editPostRepository.getPost();
+                if (postModel != null && postModel.getAuthorDisplayName() == null) {
+                    updateAuthorTextView(mAccountStore.getAccount().getDisplayName());
+                }
+            } else {
+                mAuthorTextView.setText(authorDisplayName);
             }
-        } else {
-            mAuthorTextView.setText(authorDisplayName);
         }
     }
 

WordPress/src/main/res/layout/edit_post_settings_fragment.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/settings_fragment_root"
     android:theme="@style/PostSettingsTheme"
     android:layout_width="match_parent"
@@ -65,11 +66,17 @@
                     android:hint="@string/post_settings_not_set" />
             </LinearLayout>
 
-            <View style="@style/PostSettingsDivider" />
+            <View
+                android:id="@+id/post_author_divider"
+                style="@style/PostSettingsDivider"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <LinearLayout
                 android:id="@+id/post_author_container"
-                style="@style/PostSettingsContainer" >
+                style="@style/PostSettingsContainer"
+                android:visibility="gone"
+                tools:visibility="visible" >
 
                 <com.google.android.material.textview.MaterialTextView
                     style="@style/PostSettingsTitle"

WordPress/src/main/res/values-ar/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2022-09-13 10:54:08+0000
 Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: ar
 -->
 <resources>

WordPress/src/main/res/values-az/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2015-12-08 01:00:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: az
 -->
 <resources>

WordPress/src/main/res/values-bg/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2018-12-10 19:56:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: bg
 -->
 <resources>

WordPress/src/main/res/values-cs/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-08-31 08:15:33+0000
+Translation-Revision-Date: 2022-09-16 15:59:20+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: cs_CZ
 -->
 <resources>
@@ -1127,6 +1127,7 @@ Language: cs_CZ
     <string name="error_failed_to_load_into_file">Načtení do souboru se nezdařilo, zkuste to znovu.</string>
     <string name="crop">oříznutí</string>
     <string name="insert_label_with_count">Vložit %d</string>
+    <string name="feature_announcement_dialog_label">Co je nového na %s</string>
     <string name="feature_announcement_find_out_mode">Zjistit více</string>
     <string name="sitepicker_continue_flow">Pokračovat</string>
     <string name="whats_new_in_version_title">Co je nového</string>
@@ -1218,6 +1219,7 @@ Language: cs_CZ
     <string name="post_list_tab_scheduled_posts">Naplánováno</string>
     <string name="post_list_tab_published_posts">Publikováno</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Nepřipojeno</string>
+    <string name="sharing_facebook_account_must_have_pages">Připojení k Facebooku nemůže najít žádné stránky. Publicita se nemůže připojit k profilům Facebooku, pouze k publikovaným stránkám.</string>
     <string name="notifications_tab_title_comments">Komentáře</string>
     <string name="notifications_tab_title_unread_notifications">Nepřečteno</string>
     <string name="dlg_cancel_action_dont_trash">Ponechat</string>

WordPress/src/main/res/values-cy/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2017-03-25 17:35:05+0000
 Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: cy_GB
 -->
 <resources>

WordPress/src/main/res/values-da/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2021-08-01 11:11:29+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: da_DK
 -->
 <resources>

WordPress/src/main/res/values-de/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2022-09-08 09:34:53+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-alpha.2
+Generator: GlotPress/4.0.0-alpha.3
 Language: de
 -->
 <resources>