Merge pull request #19731 from wordpress-mobile/issue/19729-reader-post-details-revert-removal-view-in-browser-and-share-from-toolbar

[Reader Improvements] Show "View in browser" and "Share" actions in reader post details toolbar

Author: RenanLukas

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt

@@ -106,6 +106,8 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryActi
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.tracker.ReaderTracker.Companion.SOURCE_POST_DETAIL
+import org.wordpress.android.ui.reader.tracker.ReaderTracker.Companion.SOURCE_POST_DETAIL_TOOLBAR
 import org.wordpress.android.ui.reader.utils.ReaderUtils
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.reader.utils.ReaderVideoUtils
@@ -1046,21 +1048,13 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     }
 
     override fun onPrepareMenu(menu: Menu) {
-        val isReaderImprovementsEnabled = readerImprovementsFeatureConfig.isEnabled()
-
         val postHasUrl = viewModel.post?.hasUrl() == true
         val menuBrowse = menu.findItem(R.id.menu_browse)
-        menuBrowse?.isVisible = if (!isReaderImprovementsEnabled) {
-            // browse require the post to have a URL (some feed-based posts don't have one) or an intercepted URI
-            postHasUrl || viewModel.interceptedUri != null
-        } else {
-            // in the Reader improvements we are only showing this as a fallback for posts with intercepted URI only
-            !postHasUrl && viewModel.interceptedUri != null
-        }
-
+        // browse require the post to have a URL (some feed-based posts don't have one) or an intercepted URI
+        menuBrowse?.isVisible = postHasUrl || viewModel.interceptedUri != null
+        // share require the post to have a URL
         val menuShare = menu.findItem(R.id.menu_share)
-        // share should not be shown as a TopBar item after Reader improvements (only in the "more" menu)
-        menuShare?.isVisible = postHasUrl && !isReaderImprovementsEnabled
+        menuShare?.isVisible = postHasUrl
     }
 
     override fun onMenuItemSelected(menuItem: MenuItem) = when (menuItem.itemId) {
@@ -1076,6 +1070,19 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             }
             true
         }
+        R.id.menu_share -> {
+            viewModel.post?.let {
+                readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.SHARED_ITEM_READER,
+                    it.blogId,
+                    it.feedId,
+                    it.isFollowedByCurrentUser,
+                    SOURCE_POST_DETAIL_TOOLBAR,
+                )
+            }
+            ReaderActivityLauncher.sharePost(context, viewModel.post)
+            true
+        }
         R.id.menu_more -> {
             viewModel.onMoreButtonClicked()
             true

WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt

@@ -415,6 +415,7 @@ class ReaderTracker @Inject constructor(
         const val SOURCE_SITE_PREVIEW = "site_preview"
         const val SOURCE_TAG_PREVIEW = "tag_preview"
         const val SOURCE_POST_DETAIL = "post_detail"
+        const val SOURCE_POST_DETAIL_TOOLBAR = "post_detail_toolbar"
         const val SOURCE_POST_DETAIL_COMMENT_SNIPPET = "post_detail_comment_snippet"
         const val SOURCE_COMMENT = "comment"
         const val SOURCE_USER = "user"

WordPress/src/main/res/menu/reader_detail.xml

@@ -6,14 +6,12 @@
         android:id="@+id/menu_browse"
         android:icon="@drawable/ic_globe_white_24dp"
         android:title="@string/view_in_browser"
-        android:visible="false"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_white_24dp"
         android:title="@string/share_action"
-        android:visible="false"
         app:showAsAction="always" />
 
     <item

libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -379,7 +379,6 @@ public enum Stat {
         CLOSE_ACCOUNT_FAILED,
         CLOSED_ACCOUNT,
         ACCOUNT_LOGOUT,
-        SHARED_ITEM,
         SHARED_ITEM_READER,
         ADDED_SELF_HOSTED_SITE,
         SIGNED_IN,

libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java

@@ -1031,8 +1031,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "close_account_failed";
             case CLOSED_ACCOUNT:
                 return "closed_account";
-            case SHARED_ITEM:
-                return "item_shared";
             case SHARED_ITEM_READER:
                 return "item_shared_reader";
             case ADDED_SELF_HOSTED_SITE: