wordpress-mobile
diff --git a/‎WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java‎
Lines changed: 3 additions & 0 deletions b/‎WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderAuthorProfileBottomSheetFragment.kt‎
Lines changed: 96 additions & 0 deletions b/‎WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderAuthorProfileBottomSheetFragment.kt‎
Lines changed: 96 additions & 0 deletions
diff --git a/‎WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt‎
Lines changed: 66 additions & 79 deletions b/‎WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt‎
Lines changed: 66 additions & 79 deletions
@@ -136,6 +136,9 @@ public static ReaderPost fromJson(JSONObject json) {
             post.blogId = jsonEditorial.optLong("blog_id");
             post.mBlogName = JSONUtils.getStringDecoded(jsonEditorial, "blog_name");
             post.mFeaturedImage = getEditorialImage(JSONUtils.getString(jsonEditorial, "image"));
+            if (post.mFeaturedImage == null) {
+                post.mFeaturedImage = JSONUtils.getString(json, "featured_image");
+            }
             post.setPrimaryTag(JSONUtils.getString(jsonEditorial, "highlight_topic_title"));
             // freshly-pressed posts show the date they were chosen rather than the day published
             post.mDatePublished = JSONUtils.getString(jsonEditorial, "displayed_on");
 
@@ -0,0 +1,96 @@
+package org.wordpress.android.ui.reader
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderAuthorProfileBottomSheetBinding
+import org.wordpress.android.util.UrlUtils
+import org.wordpress.android.util.WPAvatarUtils
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ReaderAuthorProfileBottomSheetFragment : BottomSheetDialogFragment() {
+    @Inject
+    lateinit var imageManager: ImageManager
+
+    private var _binding: ReaderAuthorProfileBottomSheetBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ReaderAuthorProfileBottomSheetBinding.inflate(
+            inflater, container, false
+        )
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val args = requireArguments()
+
+        val authorName = args.getString(ARG_AUTHOR_NAME).orEmpty()
+        val authorAvatar = args.getString(ARG_AUTHOR_AVATAR).orEmpty()
+        val blogName = args.getString(ARG_BLOG_NAME).orEmpty()
+        val blogUrl = args.getString(ARG_BLOG_URL).orEmpty()
+
+        val avatarSz = resources.getDimensionPixelSize(
+            R.dimen.user_profile_bottom_sheet_avatar_sz
+        )
+        imageManager.loadIntoCircle(
+            binding.authorAvatar,
+            ImageType.AVATAR_WITH_BACKGROUND,
+            WPAvatarUtils.rewriteAvatarUrl(authorAvatar, avatarSz)
+        )
+
+        binding.authorName.text = authorName
+
+        if (blogUrl.isNotBlank()) {
+            binding.authorBlogName.isVisible = true
+            binding.authorBlogName.text =
+                blogName.ifBlank { UrlUtils.getHost(blogUrl) }
+            binding.authorBlogName.setOnClickListener {
+                val ctx = context ?: return@setOnClickListener
+                ReaderActivityLauncher.openUrl(ctx, blogUrl)
+                dismiss()
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        const val TAG = "ReaderAuthorProfileBottomSheetFragment"
+        private const val ARG_AUTHOR_NAME = "author_name"
+        private const val ARG_AUTHOR_AVATAR = "author_avatar"
+        private const val ARG_BLOG_NAME = "blog_name"
+        private const val ARG_BLOG_URL = "blog_url"
+
+        fun newInstance(
+            authorName: String,
+            authorAvatar: String,
+            blogName: String,
+            blogUrl: String,
+        ) = ReaderAuthorProfileBottomSheetFragment().apply {
+            arguments = bundleOf(
+                ARG_AUTHOR_NAME to authorName,
+                ARG_AUTHOR_AVATAR to authorAvatar,
+                ARG_BLOG_NAME to blogName,
+                ARG_BLOG_URL to blogUrl,
+            )
+        }
+    }
+}
@@ -24,7 +24,6 @@ import android.view.ViewGroup
 import android.view.ViewStub
 import android.webkit.CookieManager
 import android.webkit.WebView
-import android.widget.ImageView.ScaleType.CENTER_CROP
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
@@ -37,6 +36,7 @@ import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
@@ -48,7 +48,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.facebook.shimmer.ShimmerFrameLayout
 import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.behavior.HideBottomViewOnScrollBehavior
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
@@ -118,7 +117,6 @@ import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiSt
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.LoadingUiState
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
 import org.wordpress.android.ui.reader.views.ReaderIconCountView
-import org.wordpress.android.ui.reader.views.ReaderPostDetailsHeaderViewUiStateBuilder
 import org.wordpress.android.ui.reader.views.ReaderSimplePostContainerView
 import org.wordpress.android.ui.reader.views.ReaderWebView
 import org.wordpress.android.ui.reader.views.ReaderWebView.ReaderCustomViewListener
@@ -146,7 +144,6 @@ import org.wordpress.android.util.extensions.getSerializableCompat
 import org.wordpress.android.util.extensions.setVisible
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageType.PHOTO
 import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
 import org.wordpress.android.viewmodel.ContextProvider
 import org.wordpress.android.viewmodel.observeEvent
@@ -158,7 +155,6 @@ import java.net.HttpURLConnection
 import java.util.EnumSet
 import javax.inject.Inject
 import com.google.android.material.R as MaterialR
-import androidx.core.view.isGone
 import androidx.core.net.toUri
 import androidx.core.view.forEach
 
@@ -251,9 +247,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     @Inject
     internal lateinit var imageManager: ImageManager
 
-    @Inject
-    lateinit var postDetailsHeaderViewUiStateBuilder: ReaderPostDetailsHeaderViewUiStateBuilder
-
     @Inject
     lateinit var readerUtilsWrapper: ReaderUtilsWrapper
 
@@ -292,36 +285,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     val isCustomViewShowing: Boolean
         get() = view != null && readerWebView.isCustomViewShowing
 
-    private val appBarLayoutOffsetChangedListener =
-        AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
-            val collapsingToolbarLayout = appBarLayout
-                .findViewById<CollapsingToolbarLayout>(R.id.collapsing_toolbar)
-            val toolbar = appBarLayout.findViewById<Toolbar>(R.id.toolbar_main)
-
-            view?.context?.let { context ->
-                val menu: Menu = toolbar.menu
-
-                val collapsingToolbarHeight = collapsingToolbarLayout.height
-                val isCollapsed = (collapsingToolbarHeight + verticalOffset) <=
-                        collapsingToolbarLayout.scrimVisibleHeightTrigger
-
-                val color = if (isCollapsed) {
-                    context.getColorFromAttribute(MaterialR.attr.colorOnSurface)
-                } else {
-                    ContextCompat.getColor(context, R.color.white)
-                }
-                val colorFilter = BlendModeColorFilterCompat
-                    .createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_ATOP)
-
-                toolbar.setTitleTextColor(color)
-                toolbar.navigationIcon?.colorFilter = colorFilter
-
-                menu.forEach {
-                    it.icon?.colorFilter = colorFilter
-                }
-            }
-        }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().application as WordPress).component().inject(this)
@@ -404,8 +367,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         appBar = view.findViewById(R.id.appbar_with_collapsing_toolbar_layout)
         toolBar = appBar.findViewById(R.id.toolbar_main)
 
-        appBar.addOnOffsetChangedListener(appBarLayoutOffsetChangedListener)
-
         // Fixes collapsing toolbar layout being obscured by the status bar when drawn behind it
         ViewCompat.setOnApplyWindowInsetsListener(appBar) { _: View, insets: WindowInsetsCompat ->
             val insetTop = insets.getInsets(WindowInsetsCompat. Type. systemBars()).top
@@ -430,6 +391,21 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             toolBar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp)
             toolBar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
         }
+
+        applyToolbarIconColors(view.context)
+    }
+
+    private fun applyToolbarIconColors(context: Context) {
+        val color = context.getColorFromAttribute(
+            MaterialR.attr.colorOnSurface
+        )
+        val colorFilter = BlendModeColorFilterCompat
+            .createBlendModeColorFilterCompat(
+                color, BlendModeCompat.SRC_ATOP
+            )
+        toolBar.setTitleTextColor(color)
+        toolBar.navigationIcon?.colorFilter = colorFilter
+        toolBar.menu.forEach { it.icon?.colorFilter = colorFilter }
     }
 
     private fun initScrollView(view: View) {
@@ -695,30 +671,44 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         with(requireActivity()) {
             if (this.isFinishing) return@with
 
-            val shouldSkipAnimation = likeFacesTrain.isGone && state.goingToShowFaces
+            val shouldSkipAnimation =
+                likeFacesTrain.isGone && state.goingToShowFaces
 
             setupLikeFacesTrain(
                 state.engageItemsList,
                 state.showLoading,
                 shouldSkipAnimation
             )
 
-            likeProgressBar.visibility = if (state.showLoading) View.VISIBLE else View.GONE
-            likeFacesTrain.visibility = if (state.showLikeFacesTrainContainer) View.VISIBLE else View.GONE
+            likeProgressBar.visibility =
+                if (state.showLoading) View.VISIBLE else View.GONE
+            likeFacesTrain.visibility =
+                if (state.showLikeFacesTrainContainer) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
 
             if (state.showEmptyState) {
-                uiHelpers.setTextOrHide(likeEmptyStateText, state.emptyStateTitle?.let {
-                    getString(R.string.like_faces_error_loading_message, uiHelpers.getTextOfUiString(this, it))
-                })
+                uiHelpers.setTextOrHide(
+                    likeEmptyStateText,
+                    state.emptyStateTitle?.let {
+                        getString(
+                            R.string.like_faces_error_loading_message,
+                            uiHelpers.getTextOfUiString(this, it)
+                        )
+                    }
+                )
                 likeEmptyStateText.visibility = View.VISIBLE
             } else {
                 likeEmptyStateText.visibility = View.GONE
             }
 
-            likeFacesTrain.contentDescription = uiHelpers.getTextOfUiString(
-                contextProvider.getContext(),
-                state.contentDescription
-            )
+            likeFacesTrain.contentDescription =
+                uiHelpers.getTextOfUiString(
+                    contextProvider.getContext(),
+                    state.contentDescription
+                )
 
             likeFacesTrain.setOnClickListener {
                 if (!isAdded) return@setOnClickListener
@@ -798,10 +788,19 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             }
         }
 
-        binding.headerView.updatePost(state.headerUiState, getReadingPreferences())
+        binding.headerView.updatePost(
+            state.headerUiState,
+            getReadingPreferences(),
+            viewModel::handleHeaderAction
+        )
+
+        binding.expandableTagsView.setVisible(state.headerUiState.tagItems.isNotEmpty())
+        binding.expandableTagsView.updateUi(
+            state.headerUiState.tagItems, getReadingPreferences()
+        )
+
         showOrHideMoreMenu(state)
 
-        updateFeaturedImage(state.featuredImageUiState, binding)
         updateExcerptFooter(state.excerptFooterUiState)
 
         with(layoutFooterBinding) {
@@ -921,35 +920,29 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
                     ReaderReadingPreferencesTracker.Source.POST_DETAIL_MORE_MENU,
                 )
 
+            is ReaderNavigationEvents.ShowAuthorProfile -> showAuthorProfile(this)
+
             is ReaderNavigationEvents.ShowPostDetail,
             is ReaderNavigationEvents.ShowVideoViewer,
             is ReaderNavigationEvents.ShowReaderSubs -> Unit // Do Nothing
             is ReaderNavigationEvents.ShowLoginRequiredBottomSheet -> showLoginRequiredBottomSheet()
         }
     }
 
+    private fun showAuthorProfile(event: ReaderNavigationEvents.ShowAuthorProfile) {
+        ReaderAuthorProfileBottomSheetFragment.newInstance(
+            authorName = event.authorName,
+            authorAvatar = event.authorAvatar,
+            blogName = event.blogName,
+            blogUrl = event.blogUrl,
+        ).show(childFragmentManager, ReaderAuthorProfileBottomSheetFragment.TAG)
+    }
+
     private fun showLoginRequiredBottomSheet() {
         ReaderLoginRequiredBottomSheetFragment.newInstance()
             .show(childFragmentManager, ReaderLoginRequiredBottomSheetFragment.TAG)
     }
 
-    private fun updateFeaturedImage(
-        state: ReaderPostDetailsUiState.ReaderPostFeaturedImageUiState?,
-        binding: ReaderFragmentPostDetailBinding
-    ) {
-        val featuredImageView = binding.appbarWithCollapsingToolbarLayout.featuredImage
-        featuredImageView.setVisible(state != null)
-        state?.let {
-            featuredImageView.layoutParams.height = it.height
-            it.url?.let { url ->
-                imageManager.load(featuredImageView, PHOTO, url, CENTER_CROP)
-                featuredImageView.setOnClickListener {
-                    viewModel.onFeaturedImageClicked(blogId = state.blogId, featuredImageUrl = url)
-                }
-            }
-        }
-    }
-
     private fun updateExcerptFooter(state: ReaderPostDetailsUiState.ExcerptFooterUiState?) {
         // if we're showing just the excerpt, show a footer which links to the full post
         excerptFooter.setVisible(state != null)
@@ -993,16 +986,8 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
     }
 
-    private fun modifyMoreMenu(
-        postBlocked: Boolean
-    ){
-        val moreMenu:MenuItem? = toolBar.menu.findItem(R.id.menu_more)
-        if (postBlocked){
-            moreMenu?.setVisible(false)
-        }
-        else{
-            moreMenu?.setVisible(true)
-        }
+    private fun modifyMoreMenu(postBlocked: Boolean) {
+        toolBar.menu.findItem(R.id.menu_more)?.isVisible = !postBlocked
     }
 
     private fun showOrHideMoreMenu(
@@ -1080,6 +1065,8 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         // show more menu
         val menuMore = menu.findItem(R.id.menu_more)
         menuMore?.isVisible = true
+
+        applyToolbarIconColors(toolBar.context)
     }
 
     private fun hideMenu(menu: Menu) {