Remove unused files and new suffix

wordpress-mobile · RenanLukas · Jun 5, 2024 · Jun 5, 2024 · Jun 6, 2024 · Jun 6, 2024
commit 0827d2a6222c8597dff95007db214ec73f5177ae
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java
@@ -276,7 +276,7 @@ public int getItemViewType(int position) {
                 return new GapMarkerViewHolder(new ReaderGapMarkerView(context));
 
             case VIEW_TYPE_XPOST:
-                postView = LayoutInflater.from(context).inflate(R.layout.reader_cardview_xpost_new, parent, false);
+                postView = LayoutInflater.from(context).inflate(R.layout.reader_cardview_xpost, parent, false);
                 return new ReaderXPostViewHolder(postView);
             case VIEW_TYPE_REMOVED_POST:
                 postView = LayoutInflater.from(context).inflate(

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt
@@ -9,7 +9,7 @@ import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostNewU
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderAnnouncementCardViewHolder
-import org.wordpress.android.ui.reader.discover.viewholders.ReaderInterestsCardNewViewHolder
+import org.wordpress.android.ui.reader.discover.viewholders.ReaderInterestsCardViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostNewViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderRecommendedBlogsCardNewViewHolder
@@ -44,7 +44,7 @@ class ReaderDiscoverAdapter(
                 parent
             )
 
-            INTEREST_VIEW_TYPE -> ReaderInterestsCardNewViewHolder(uiHelpers, parent)
+            INTEREST_VIEW_TYPE -> ReaderInterestsCardViewHolder(uiHelpers, parent)
 
             RECOMMENDED_BLOGS_VIEW_TYPE -> ReaderRecommendedBlogsCardNewViewHolder(parent, imageManager)
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderInterestNewAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderInterestNewAdapter.kt
diff --git a/...s/src/main/java/org/wordpress/android/ui/reader/discover/ReaderRecommendedBlogsAdapter.kt b/...s/src/main/java/org/wordpress/android/ui/reader/discover/ReaderRecommendedBlogsAdapter.kt
@@ -5,15 +5,13 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderRecommendedBlogViewHolder
-import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
 
 class ReaderRecommendedBlogsAdapter(
     private val imageManager: ImageManager,
-    private val uiHelpers: UiHelpers,
 ) : ListAdapter<ReaderRecommendedBlogUiState, ReaderRecommendedBlogViewHolder>(RecommendedBlogsDiffUtil()) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReaderRecommendedBlogViewHolder {
-        return ReaderRecommendedBlogViewHolder(parent, imageManager, uiHelpers)
+        return ReaderRecommendedBlogViewHolder(parent, imageManager)
     }
 
     override fun onBindViewHolder(holder: ReaderRecommendedBlogViewHolder, position: Int) {

diff --git a/...rc/main/java/org/wordpress/android/ui/reader/discover/ReaderRecommendedBlogsNewAdapter.kt b/...rc/main/java/org/wordpress/android/ui/reader/discover/ReaderRecommendedBlogsNewAdapter.kt
diff --git a/.../java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestNewViewHolder.kt b/.../java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestNewViewHolder.kt
diff --git a/...ain/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt b/...ain/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt
@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
 import android.view.ViewGroup
-import androidx.appcompat.content.res.AppCompatResources.getColorStateList
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.databinding.ReaderInterestItemBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ReaderInterestUiState
@@ -14,13 +13,7 @@ class ReaderInterestViewHolder(
     private val binding: ReaderInterestItemBinding = parent.viewBinding(ReaderInterestItemBinding::inflate)
 ) : RecyclerView.ViewHolder(binding.root) {
     fun onBind(uiState: ReaderInterestUiState) = with(binding) {
-        uiHelpers.setTextOrHide(interest, uiState.interest)
-        interest.setOnClickListener { uiState.onClicked.invoke(uiState.interest) }
-
-        with(uiState.chipStyle) {
-            interest.setChipStrokeColorResource(chipStrokeColorResId)
-            interest.setChipBackgroundColorResource(chipFillColorResId)
-            interest.setTextColor(getColorStateList(interest.context, chipFontColorResId))
-        }
+        uiHelpers.setTextOrHide(chip, uiState.interest)
+        chip.setOnClickListener { uiState.onClicked.invoke(uiState.interest) }
     }
 }
diff --git a/...lders/ReaderInterestsCardNewViewHolder.kt → ...wholders/ReaderInterestsCardViewHolder.kt b/...lders/ReaderInterestsCardNewViewHolder.kt → ...wholders/ReaderInterestsCardViewHolder.kt
@@ -10,24 +10,24 @@ import com.google.android.flexbox.FlexDirection
 import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
 import org.wordpress.android.R
-import org.wordpress.android.databinding.ReaderInterestCardNewBinding
+import org.wordpress.android.databinding.ReaderInterestCardBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
-import org.wordpress.android.ui.reader.discover.ReaderInterestNewAdapter
+import org.wordpress.android.ui.reader.discover.ReaderInterestAdapter
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.extensions.viewBinding
 import org.wordpress.android.widgets.RecyclerItemDecoration
 
 private const val Y_BUFFER = 10
 
-class ReaderInterestsCardNewViewHolder(
+class ReaderInterestsCardViewHolder(
     uiHelpers: UiHelpers,
     parentView: ViewGroup
-) : ReaderViewHolder<ReaderInterestCardNewBinding>(parentView.viewBinding(ReaderInterestCardNewBinding::inflate)) {
+) : ReaderViewHolder<ReaderInterestCardBinding>(parentView.viewBinding(ReaderInterestCardBinding::inflate)) {
     init {
         with(binding.recommendedTags) {
             if (adapter == null) {
                 layoutManager = FlexboxLayoutManager(context, FlexDirection.ROW, FlexWrap.WRAP)
-                val readerInterestAdapter = ReaderInterestNewAdapter(uiHelpers)
+                val readerInterestAdapter = ReaderInterestAdapter(uiHelpers)
                 setItemSpacing()
                 adapter = readerInterestAdapter
             }
@@ -50,7 +50,7 @@ class ReaderInterestsCardNewViewHolder(
     override fun onBind(uiState: ReaderCardUiState) = with(binding) {
         uiState as ReaderCardUiState.ReaderInterestsCardUiState
         setOnTouchItemListener()
-        (recommendedTags.adapter as ReaderInterestNewAdapter).update(uiState.interest)
+        (recommendedTags.adapter as ReaderInterestAdapter).update(uiState.interest)
     }
 
     private fun setOnTouchItemListener() = with(binding) {

diff --git a/...rg/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogNewViewHolder.kt b/...rg/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogNewViewHolder.kt
diff --git a/...a/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt b/...a/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt
@@ -4,33 +4,37 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.databinding.ReaderRecommendedBlogItemBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
-import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.extensions.viewBinding
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
 
 class ReaderRecommendedBlogViewHolder(
     parent: ViewGroup,
     private val imageManager: ImageManager,
-    private val uiHelpers: UiHelpers,
     private val binding: ReaderRecommendedBlogItemBinding =
         parent.viewBinding(ReaderRecommendedBlogItemBinding::inflate)
 ) : RecyclerView.ViewHolder(binding.root) {
-    fun onBind(uiState: ReaderRecommendedBlogUiState) = with(binding) {
-        with(uiState) {
-            siteName.text = name
-            siteUrl.text = url
-            uiHelpers.setTextOrHide(siteDescription, description)
-            siteFollowButton.apply {
-                setIsFollowed(isFollowed)
-                contentDescription = context.getString(followContentDescription.stringRes)
-                setOnClickListener {
-                    onFollowClicked(uiState)
-                }
-            }
-            updateBlogImage(iconUrl)
+    fun onBind(uiState: ReaderRecommendedBlogUiState) =
+        with(binding) {
+            siteName.text = uiState.name
+            siteUrl.text = uiState.url
+            updateSiteFollowButton(uiState, this)
+            updateBlogImage(uiState.iconUrl)
             root.setOnClickListener {
-                onItemClicked(blogId, feedId, isFollowed)
+                uiState.onItemClicked(uiState.blogId, uiState.feedId, uiState.isFollowed)
+            }
+        }
+
+    private fun updateSiteFollowButton(
+        uiState: ReaderRecommendedBlogUiState,
+        binding: ReaderRecommendedBlogItemBinding
+    ) {
+        with(binding.siteFollowButton) {
+            isEnabled = uiState.isFollowEnabled
+            setIsFollowed(uiState.isFollowed)
+            contentDescription = context.getString(uiState.followContentDescription.stringRes)
+            setOnClickListener {
+                uiState.onFollowClicked(uiState)
             }
         }
     }

diff --git a/...rdpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardNewViewHolder.kt b/...rdpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardNewViewHolder.kt
@@ -1,21 +1,21 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
 import android.view.ViewGroup
-import org.wordpress.android.databinding.ReaderRecommendedBlogsCardNewBinding
+import org.wordpress.android.databinding.ReaderRecommendedBlogsCardBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState
-import org.wordpress.android.ui.reader.discover.ReaderRecommendedBlogsNewAdapter
+import org.wordpress.android.ui.reader.discover.ReaderRecommendedBlogsAdapter
 import org.wordpress.android.util.extensions.viewBinding
 import org.wordpress.android.util.image.ImageManager
 
 class ReaderRecommendedBlogsCardNewViewHolder(
     parentView: ViewGroup,
     imageManager: ImageManager,
-) : ReaderViewHolder<ReaderRecommendedBlogsCardNewBinding>(
-    parentView.viewBinding(ReaderRecommendedBlogsCardNewBinding::inflate)
+) : ReaderViewHolder<ReaderRecommendedBlogsCardBinding>(
+    parentView.viewBinding(ReaderRecommendedBlogsCardBinding::inflate)
 ) {
     private val recommendedBlogsAdapter =
-        ReaderRecommendedBlogsNewAdapter(imageManager)
+        ReaderRecommendedBlogsAdapter(imageManager)
 
     init {
         with(binding) {

diff --git a/.../res/layout/reader_cardview_xpost_new.xml → ...main/res/layout/reader_cardview_xpost.xml b/.../res/layout/reader_cardview_xpost_new.xml → ...main/res/layout/reader_cardview_xpost.xml
diff --git a/...n/res/layout/reader_interest_card_new.xml → .../main/res/layout/reader_interest_card.xml b/...n/res/layout/reader_interest_card_new.xml → .../main/res/layout/reader_interest_card.xml
diff --git a/WordPress/src/main/res/layout/reader_interest_item.xml b/WordPress/src/main/res/layout/reader_interest_item.xml
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.google.android.material.chip.Chip xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/reader_interest_container"
+    android:id="@+id/chip"
+    style="@style/ReaderExpandableTagsViewChipInterestNew"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/margin_small"
-    android:layout_marginEnd="@dimen/margin_small"
-    android:layout_marginBottom="@dimen/margin_extra_large"
-    android:layout_marginTop="@dimen/margin_extra_large">
-
-    <com.google.android.material.chip.Chip
-        android:id="@+id/interest"
-        style="@style/ReaderTextView.Interests.ListItem.Chip"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:chipStrokeWidth="@dimen/divider_size"
-        app:chipStartPadding="@dimen/margin_large"
-        app:chipEndPadding="@dimen/margin_large"
-        tools:text="Photography"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
+    tools:text="A Text in a chip" />
diff --git a/WordPress/src/main/res/layout/reader_interest_item_new.xml b/WordPress/src/main/res/layout/reader_interest_item_new.xml