Remove special treatment for photo (photo title)

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

@@ -74,7 +74,6 @@ sealed class ReaderCardUiState {
         val blogSection: CompactBlogSectionData,
         val title: UiString?,
         val excerpt: String?,
-        val photoTitle: String?,
         val featuredImageUrl: String?,
         val featuredImageCornerRadius: UiDimen,
         val fullVideoUrl: String?,

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

@@ -223,10 +223,9 @@ class ReaderPostUiStateBuilder @Inject constructor(
             feedId = post.feedId,
             isFollowed = post.isFollowedByCurrentUser,
             blogSection = buildCompactBlogSection(post, onPostHeaderViewClicked, post.isP2orA8C),
-            excerpt = buildExcerpt(post),
-            title = buildTitle(post),
+            title = buildTitle(post, forceForPhoto = true, allowEmptyTitle = true),
+            excerpt = buildExcerpt(post, forceForPhoto = true),
             photoFrameVisibility = buildPhotoFrameVisibility(post),
-            photoTitle = buildPhotoTitle(post),
             featuredImageUrl = buildFeaturedImageUrl(post, photonWidth, photonHeight),
             featuredImageCornerRadius = UIDimenRes(R.dimen.reader_featured_image_corner_radius),
             thumbnailStripSection = buildThumbnailStripUrls(post),
@@ -407,19 +406,17 @@ class ReaderPostUiStateBuilder @Inject constructor(
         (post.hasFeaturedVideo() || post.hasFeaturedImage()) &&
                 post.cardType != GALLERY
 
-    // TODO malinjir show title only when buildPhotoTitle == null
-    private fun buildTitle(post: ReaderPost): UiString? {
-        return if (post.cardType != PHOTO) {
+    private fun buildTitle(post: ReaderPost, forceForPhoto: Boolean = false, allowEmptyTitle: Boolean = false): UiString? {
+        return if (post.cardType != PHOTO || forceForPhoto) {
             post.takeIf { it.hasTitle() }?.title?.let { UiStringText(it) }
-                ?: UiStringRes(R.string.untitled_in_parentheses)
+                ?: UiStringRes(R.string.untitled_in_parentheses).takeUnless { allowEmptyTitle }
         } else {
             null
         }
     }
 
-    // TODO malinjir show excerpt only when buildPhotoTitle == null
-    private fun buildExcerpt(post: ReaderPost) =
-        post.takeIf { post.cardType != PHOTO && post.hasExcerpt() }?.excerpt
+    private fun buildExcerpt(post: ReaderPost, forceForPhoto: Boolean = false) =
+        post.takeIf { (post.cardType != PHOTO || forceForPhoto) && post.hasExcerpt() }?.excerpt
 
     private fun buildBlogName(post: ReaderPost, isP2Post: Boolean = false): UiString {
         val blogName = post.takeIf { it.hasBlogName() }?.blogName?.let { UiStringText(it) }

WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderPostNewViewHolder.kt

@@ -52,7 +52,6 @@ class ReaderPostNewViewHolder(
         // Featured image section
         updateFeaturedImage(state)
         uiHelpers.updateVisibility(imageVideoOverlay, state.videoOverlayVisibility)
-        uiHelpers.setTextOrHide(textPhotoTitle, state.photoTitle)
         uiHelpers.updateVisibility(thumbnailStrip, state.thumbnailStripSection != null)
         state.thumbnailStripSection?.let {
             thumbnailStrip.loadThumbnails(it.images, it.isPrivate, it.content)

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

@@ -79,27 +79,6 @@
             app:layout_constraintTop_toTopOf="@id/image_featured"
             app:layout_constraintBottom_toBottomOf="@id/image_featured"
             tools:visibility="visible" />
-
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/text_photo_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_large"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginEnd="@dimen/margin_large"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:shadowColor="@color/neutral_70"
-            android:shadowDx="@dimen/reader_photo_title_shadow_offset"
-            android:shadowDy="@dimen/reader_photo_title_shadow_offset"
-            android:shadowRadius="@dimen/reader_photo_title_shadow_radius"
-            android:textColor="?attr/colorOnPrimarySurface"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="@id/image_featured"
-            tools:text="text_photo_title" />
         <!-- image section end -->
 
         <org.wordpress.android.ui.reader.views.ReaderThumbnailStrip