CMM-1011 reader blog page logged out subscribe (#22378)

adalpari · web-flow · commit 5cfe96fa3bf9 · 2025-12-02T18:11:29.000+01:00
* Making the subscribe CTA to follow the same approach as in other reader cards and pages

* Fixing snackbar usage

* Using a bottomsheet to login

* Using the bottomsheet in all the scenarios

* Navigating to Me instead of login to follow the same approach as in other reader cases
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -1415,6 +1415,14 @@ public static void newBlogForResult(Activity activity, SiteCreationSource source
         activity.startActivityForResult(intent, RequestCodes.CREATE_SITE);
     }
 
+    public static void showMainActivityAndMeScreen(Context context) {
+        Intent intent = new Intent(context, WPMainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        intent.putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_ME);
+        context.startActivity(intent);
+    }
+
     public static void showMainActivityAndSiteCreationActivity(Activity activity, SiteCreationSource source) {
         // If we just wanted to have WPMainActivity in the back stack after starting SiteCreationActivity, we could have
         // used a TaskStackBuilder to do so. However, since we want to handle the SiteCreationActivity result in
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -247,6 +247,7 @@ public class WPMainActivity extends BaseAppCompatActivity implements
     public static final String ARG_IS_CHANGING_CONFIGURATION = "IS_CHANGING_CONFIGURATION";
     public static final String ARG_BYPASS_MIGRATION = "bypass_migration";
     public static final String ARG_MEDIA = "show_media";
+    public static final String ARG_ME = "show_me";
     public static final String ARG_OPEN_PAGE_MESSAGE = "open_page_message";
     private boolean mIsChangingConfiguration = false;
     private WPMainNavigationView mBottomNav;
@@ -956,6 +957,9 @@ private void handleOpenPageIntent(@NonNull Intent intent) {
                     }
                     mActivityNavigator.viewCurrentBlogMedia(this, getSelectedSite());
                     break;
+                case ARG_ME:
+                    if (mBottomNav != null) mBottomNav.setCurrentSelectedPage(PageType.ME);
+                    break;
             }
         } else {
             AppLog.e(T.MAIN, "WPMainActivity.handleOpenIntent called with an invalid argument.");
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java
@@ -35,6 +35,8 @@ public interface OnFollowListener {
         void onFollowTapped(View view, String blogName, long blogId, long feedId);
 
         void onFollowingTapped();
+
+        void onFollowTappedWhenLoggedOut();
     }
 
     /*
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderLoginRequiredBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderLoginRequiredBottomSheetFragment.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.ui.reader
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.LinearLayout
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.wordpress.android.R
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.widgets.WPTextView
+
+/**
+ * A bottom sheet that prompts the user to log in to WordPress.com.
+ * Used when a logged-out user tries to perform actions that require authentication,
+ * such as subscribing to a blog.
+ *
+ * This fragment reuses the same layout as [SubfilterPageFragment] to maintain visual consistency
+ * with the empty state shown in the subfilter bottom sheet.
+ */
+class ReaderLoginRequiredBottomSheetFragment : BottomSheetDialogFragment() {
+    companion object {
+        const val TAG = "ReaderLoginRequiredBottomSheetFragment"
+
+        fun newInstance(): ReaderLoginRequiredBottomSheetFragment {
+            return ReaderLoginRequiredBottomSheetFragment()
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.subfilter_page_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Hide the recycler view since we only want to show the empty state
+        view.findViewById<RecyclerView>(R.id.content_recycler_view).visibility = View.GONE
+
+        // Show and configure the empty state container
+        val emptyStateContainer = view.findViewById<LinearLayout>(R.id.empty_state_container)
+        emptyStateContainer.visibility = View.VISIBLE
+
+        // Hide title (matching the logged-out empty state behavior)
+        view.findViewById<WPTextView>(R.id.title).visibility = View.GONE
+
+        // Set the text for logged-out users
+        view.findViewById<WPTextView>(R.id.text).setText(
+            R.string.reader_filter_self_hosted_empty_blogs_list
+        )
+
+        // Configure primary button for login
+        val primaryButton = view.findViewById<Button>(R.id.action_button_primary)
+        primaryButton.visibility = View.VISIBLE
+        primaryButton.setText(R.string.reader_filter_self_hosted_empty_sites_tags_action)
+        primaryButton.setOnClickListener {
+            dismiss()
+            ActivityLauncher.showMainActivityAndMeScreen(requireContext())
+        }
+
+        // Hide secondary button (not needed for login-only scenario)
+        view.findViewById<Button>(R.id.action_button_secondary).visibility = View.GONE
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
@@ -57,7 +57,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
@@ -936,16 +935,13 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             is ReaderNavigationEvents.ShowPostDetail,
             is ReaderNavigationEvents.ShowVideoViewer,
             is ReaderNavigationEvents.ShowReaderSubs -> Unit // Do Nothing
-            is ReaderNavigationEvents.ShowSignIn -> navigateToLogin()
+            is ReaderNavigationEvents.ShowLoginRequiredBottomSheet -> showLoginRequiredBottomSheet()
         }
     }
 
-    private fun navigateToLogin() {
-        if (BuildConfig.IS_JETPACK_APP) {
-            ActivityLauncher.showSignInForResultJetpackOnly(requireActivity())
-        } else {
-            ActivityLauncher.showSignInForResultWpComOnly(requireActivity())
-        }
+    private fun showLoginRequiredBottomSheet() {
+        ReaderLoginRequiredBottomSheetFragment.newInstance()
+            .show(childFragmentManager, ReaderLoginRequiredBottomSheetFragment.TAG)
     }
 
     private fun updateFeaturedImage(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.kt
@@ -2819,6 +2819,11 @@ class ReaderPostListFragment : ViewPagerFragment(), OnPostSelectedListener, OnFo
         dispatcher.dispatch(AccountActionBuilder.newFetchSubscriptionsAction())
     }
 
+    override fun onFollowTappedWhenLoggedOut() {
+        ReaderLoginRequiredBottomSheetFragment.newInstance()
+            .show(childFragmentManager, ReaderLoginRequiredBottomSheetFragment.TAG)
+    }
+
     @Suppress("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onSubscriptionUpdated(event: OnSubscriptionUpdated) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import org.wordpress.android.BuildConfig
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -24,6 +23,7 @@ import org.wordpress.android.ui.mysite.SelectedSiteRepository
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.reader.ReaderActivityLauncher
 import org.wordpress.android.ui.reader.ReaderActivityLauncher.OpenUrlType
+import org.wordpress.android.ui.reader.ReaderLoginRequiredBottomSheetFragment
 import org.wordpress.android.ui.reader.ReaderPostWebViewCachingFragment
 import org.wordpress.android.ui.reader.comments.ThreadedCommentsActionSource.READER_POST_CARD
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState
@@ -40,7 +40,7 @@ import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReade
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderSubs
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReportPost
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReportUser
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSignIn
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowLoginRequiredBottomSheet
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowVideoViewer
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
@@ -222,16 +222,13 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme
             OpenUrlType.INTERNAL
         )
         is ShowReaderSubs -> ReaderActivityLauncher.showReaderSubs(requireActivity())
-        is ShowSignIn -> navigateToLogin()
+        is ShowLoginRequiredBottomSheet -> showLoginRequiredBottomSheet()
         else -> Unit // Do Nothing
     }
 
-    private fun navigateToLogin() {
-        if (BuildConfig.IS_JETPACK_APP) {
-            ActivityLauncher.showSignInForResultJetpackOnly(requireActivity())
-        } else {
-            ActivityLauncher.showSignInForResultWpComOnly(requireActivity())
-        }
+    private fun showLoginRequiredBottomSheet() {
+        ReaderLoginRequiredBottomSheetFragment.newInstance()
+            .show(childFragmentManager, ReaderLoginRequiredBottomSheetFragment.TAG)
     }
 
     private fun showBookmarkSavedLocallyDialog(bookmarkDialog: ShowBookmarkedSavedOnlyLocallyDialog) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt
@@ -69,5 +69,5 @@ sealed class ReaderNavigationEvents {
     ) : ReaderNavigationEvents()
 
     data object ShowReadingPreferences : ReaderNavigationEvents()
-    data object ShowSignIn : ReaderNavigationEvents()
+    data object ShowLoginRequiredBottomSheet : ReaderNavigationEvents()
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt
@@ -331,17 +331,7 @@ class ReaderPostCardActionsHandler @Inject constructor(
     }
 
     private fun showSignInPrompt() {
-        _snackbarEvents.postValue(
-            Event(
-                SnackbarMessageHolder(
-                    UiStringRes(R.string.reader_snackbar_err_cannot_follow_logged_out),
-                    UiStringRes(R.string.reader_snackbar_err_cannot_follow_logged_out_action),
-                    buttonAction = {
-                        _navigationEvents.postValue(Event(ReaderNavigationEvents.ShowSignIn))
-                    }
-                )
-            )
-        )
+        _navigationEvents.postValue(Event(ReaderNavigationEvents.ShowLoginRequiredBottomSheet))
     }
 
     private suspend fun followSite(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailsHeaderViewUiStateBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailsHeaderViewUiStateBuilder.kt
@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.reader.views
 
 import dagger.Reusable
-import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.ui.reader.discover.ReaderPostTagsUiStateBuilder
 import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
@@ -16,7 +15,6 @@ import javax.inject.Inject
 
 @Reusable
 class ReaderPostDetailsHeaderViewUiStateBuilder @Inject constructor(
-    private val accountStore: AccountStore,
     private val postUiStateBuilder: ReaderPostUiStateBuilder,
     private val readerPostTagsUiStateBuilder: ReaderPostTagsUiStateBuilder,
     private val dateTimeUtilsWrapper: DateTimeUtilsWrapper,
@@ -25,7 +23,6 @@ class ReaderPostDetailsHeaderViewUiStateBuilder @Inject constructor(
         post: ReaderPost,
         onHeaderAction: (ReaderPostDetailsHeaderAction) -> Unit,
     ): ReaderPostDetailsHeaderUiState {
-        val hasAccessToken = accountStore.hasAccessToken()
         val textTitle = post
             .takeIf { post.hasTitle() }
             ?.title?.let { UiStringText(it) }
@@ -44,7 +41,6 @@ class ReaderPostDetailsHeaderViewUiStateBuilder @Inject constructor(
             ),
             followButtonUiState = buildFollowButtonUiState(
                 post,
-                hasAccessToken,
                 onFollowClicked = { onHeaderAction(ReaderPostDetailsHeaderAction.FollowClicked) }
             ),
             dateLine = buildDateLine(post),
@@ -68,14 +64,13 @@ class ReaderPostDetailsHeaderViewUiStateBuilder @Inject constructor(
 
     private fun buildFollowButtonUiState(
         post: ReaderPost,
-        hasAccessToken: Boolean,
         onFollowClicked: () -> Unit
     ): FollowButtonUiState {
         return FollowButtonUiState(
             onFollowButtonClicked = onFollowClicked,
             isFollowed = post.isFollowedByCurrentUser,
-            isEnabled = hasAccessToken,
-            isVisible = hasAccessToken
+            isEnabled = true,
+            isVisible = true
         )
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java
@@ -189,18 +189,20 @@ private void showBlogInfo(ReaderBlog blogInfo, String source) {
 
         loadFollowCount(blogInfo, txtFollowCount);
 
-        if (!mAccountStore.hasAccessToken()) {
-            mFollowButton.setVisibility(View.GONE);
-        } else {
-            mFollowButton.setVisibility(View.VISIBLE);
-            mFollowButton.setIsFollowed(blogInfo.isFollowing);
-            mFollowButton.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
+        mFollowButton.setVisibility(View.VISIBLE);
+        mFollowButton.setIsFollowed(blogInfo.isFollowing);
+        mFollowButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!mAccountStore.hasAccessToken()) {
+                    if (mFollowListener != null) {
+                        mFollowListener.onFollowTappedWhenLoggedOut();
+                    }
+                } else {
                     toggleFollowStatus(v, source);
                 }
-            });
-        }
+            }
+        });
 
         if (layoutInfo.getVisibility() != View.VISIBLE) {
             layoutInfo.setVisibility(View.VISIBLE);

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public interface OnFollowListener {`
`35`	`35`	`void onFollowTapped(View view, String blogName, long blogId, long feedId);`
`36`	`36`
`37`	`37`	`void onFollowingTapped();`
	`38`	`+`
	`39`	`+ void onFollowTappedWhenLoggedOut();`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,5 @@ sealed class ReaderNavigationEvents {`
`69`	`69`	`) : ReaderNavigationEvents()`
`70`	`70`
`71`	`71`	`data object ShowReadingPreferences : ReaderNavigationEvents()`
`72`		`- data object ShowSignIn : ReaderNavigationEvents()`
	`72`	`+ data object ShowLoginRequiredBottomSheet : ReaderNavigationEvents()`
`73`	`73`	`}`