[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Reader] Remove improvements FF and unused UI files #20947

Open
wants to merge 17 commits into
base: trunk
Choose a base branch
from
Open

[Reader] Remove improvements FF and unused UI files #20947

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7984511
Remove reader improvements feature config
RenanLukas Jun 5, 2024
afe6bae
Remove feature flag logic
RenanLukas Jun 5, 2024
28e0af0
Remove unused UI
RenanLukas Jun 6, 2024
a3ea9f7
Fix ReaderPostUiStateBuilder unit tests
RenanLukas Jun 6, 2024
79ab3a8
Fix detekt
RenanLukas Jun 6, 2024
0827d2a
Remove unused files and new suffix
RenanLukas Jun 6, 2024
8d71310
Continue removing reader unused files and new suffix
RenanLukas Jun 6, 2024
5cd7e4a
Fix lint
RenanLukas Jun 6, 2024
f933e21
Remove unused reader styles
RenanLukas Jun 6, 2024
64db899
Fix ReaderDiscoverViewModel unit tests
RenanLukas Jun 7, 2024
57fcdf8
Apply PR suggestion: make ChipStyle a concrete class and deleting Def…
RenanLukas Jun 10, 2024
ecd22e1
Apply PR suggestion: remove ReaderPostDetailHeaderBinding and use Rea…
RenanLukas Jun 10, 2024
5b49f7d
Remove unused onDiscoverClicked
RenanLukas Jun 10, 2024
ddf7bb5
Apply PR suggestion: remove ReaderTagBinding and use ReaderTagHeaderV…
RenanLukas Jun 10, 2024
bba2471
Fix detekt
RenanLukas Jun 10, 2024
76aa4c3
Apply PR suggestion: remove old UI logic from ReaderPostAdapter
RenanLukas Jun 10, 2024
229ddd5
Fix lint
RenanLukas Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ android {
buildConfigField "boolean", "CONTACT_SUPPORT_CHATBOT", "false"
buildConfigField "boolean", "ENABLE_DOMAIN_MANAGEMENT_FEATURE", "false"
buildConfigField "boolean", "PLANS_IN_SITE_CREATION", "false"
buildConfigField "boolean", "READER_IMPROVEMENTS", "false"
buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
buildConfigField "boolean", "STATS_TRAFFIC_SUBSCRIBERS_TABS", "false"
Expand Down
35 changes: 2 additions & 33 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ 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.elevation.ElevationOverlayProvider
import com.google.android.material.snackbar.Snackbar
import dagger.hilt.android.AndroidEntryPoint
import org.greenrobot.eventbus.EventBus
Expand All @@ -64,7 +63,6 @@ import org.wordpress.android.WordPress
import org.wordpress.android.analytics.AnalyticsTracker
import org.wordpress.android.databinding.ReaderFragmentPostDetailBinding
import org.wordpress.android.databinding.ReaderIncludePostDetailFooterBinding
import org.wordpress.android.databinding.ReaderIncludePostDetailFooterNewBinding
import org.wordpress.android.datasets.ReaderPostTable
import org.wordpress.android.fluxc.Dispatcher
import org.wordpress.android.fluxc.generated.SiteActionBuilder
Expand Down Expand Up @@ -145,7 +143,6 @@ import org.wordpress.android.util.WPPermissionUtils.READER_FILE_DOWNLOAD_PERMISS
import org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper
import org.wordpress.android.util.config.CommentsSnippetFeatureConfig
import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig
import org.wordpress.android.util.config.ReaderImprovementsFeatureConfig
import org.wordpress.android.util.config.ReaderReadingPreferencesFeatureConfig
import org.wordpress.android.util.extensions.getColorFromAttribute
import org.wordpress.android.util.extensions.getParcelableCompat
Expand Down Expand Up @@ -283,9 +280,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
@Inject
lateinit var jetpackBrandingUtils: JetpackBrandingUtils

@Inject
lateinit var readerImprovementsFeatureConfig: ReaderImprovementsFeatureConfig

@Inject
lateinit var readingPreferencesFeatureConfig: ReaderReadingPreferencesFeatureConfig

Expand Down Expand Up @@ -484,31 +478,15 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
}

private fun initLayoutFooter(view: View) {
val isReaderImprovementsEnabled = readerImprovementsFeatureConfig.isEnabled()
view.findViewById<ViewStub>(R.id.layout_post_detail_footer).apply {
layoutResource = if (isReaderImprovementsEnabled) {
R.layout.reader_include_post_detail_footer_new
} else {
R.layout.reader_include_post_detail_footer
}
layoutResource = R.layout.reader_include_post_detail_footer

setOnInflateListener { _, inflated ->
layoutFooterBinding = if (isReaderImprovementsEnabled) {
ReaderIncludePostDetailFooterNewBinding.bind(inflated).mapBinding().apply {
layoutFooterBinding = ReaderIncludePostDetailFooterBinding.bind(inflated).mapBinding().apply {
// the new bar should hide on scroll
val params = root.layoutParams as CoordinatorLayout.LayoutParams
params.behavior = HideBottomViewOnScrollBehavior<View>()
}
} else {
ReaderIncludePostDetailFooterBinding.bind(inflated).mapBinding().apply {
// the old bar should have the elevated surface color background
val elevationOverlayProvider = ElevationOverlayProvider(root.context)
val appbarElevation = resources.getDimension(R.dimen.appbar_elevation)
val elevatedSurfaceColor = elevationOverlayProvider
.compositeOverlayWithThemeSurfaceColorIfNeeded(appbarElevation)
root.setBackgroundColor(elevatedSurfaceColor)
}
}
layoutFooterBinding.root.isInvisible = true
}
}.also { stub ->
Expand Down Expand Up @@ -1891,15 +1869,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
)

private fun ReaderIncludePostDetailFooterBinding.mapBinding(): PostDetailFooterBarBinding =
PostDetailFooterBarBinding(
root,
bookmark,
reblog,
countComments,
countLikes,
)

private fun ReaderIncludePostDetailFooterNewBinding.mapBinding(): PostDetailFooterBarBinding =
PostDetailFooterBarBinding(
root,
bookmark,
Expand Down
21 changes: 6 additions & 15 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
import org.wordpress.android.util.StringUtils;
import org.wordpress.android.util.ToastUtils;
import org.wordpress.android.util.WPActivityUtils;
import org.wordpress.android.util.config.ReaderImprovementsFeatureConfig;
import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig;
import org.wordpress.android.util.image.ImageManager;
import org.wordpress.android.widgets.AppReviewManager;
Expand Down Expand Up @@ -185,7 +184,6 @@ public class ReaderPostListFragment extends ViewPagerFragment
@Inject ReaderTracker mReaderTracker;
@Inject SnackbarSequencer mSnackbarSequencer;
@Inject DisplayUtilsWrapper mDisplayUtilsWrapper;
@Inject ReaderImprovementsFeatureConfig mReaderImprovementsFeatureConfig;
private ReaderPostAdapter mPostAdapter;
private ReaderSiteSearchAdapter mSiteSearchAdapter;
private ReaderSearchSuggestionAdapter mSearchSuggestionAdapter;
Expand Down Expand Up @@ -1066,27 +1064,20 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) {
}
});

// set the background color as we have different colors for the new and legacy designs that are not easy to
// change via styles, because of the FeatureConfig logic
int backgroundColor = mReaderImprovementsFeatureConfig.isEnabled()
? R.color.reader_post_list_background_new
: R.color.reader_post_list_background;
mRecyclerView.setBackgroundColor(ContextCompat.getColor(requireContext(), backgroundColor));
mRecyclerView.setBackgroundColor(ContextCompat.getColor(
requireContext(), R.color.reader_post_list_background)
);

// add the item decoration (dividers) to the recycler, skipping the first item if the first
// item is the tag toolbar (shown when viewing posts in followed tags) - this is to avoid
// having the tag toolbar take up more vertical space than necessary
int spacingVerticalRes = mReaderImprovementsFeatureConfig.isEnabled()
? R.dimen.reader_card_gutters_new
: R.dimen.reader_card_gutters;
int spacingVerticalRes = R.dimen.reader_card_gutters;
int spacingHorizontal = getResources().getDimensionPixelSize(R.dimen.reader_card_margin);
int spacingVertical = getResources().getDimensionPixelSize(spacingVerticalRes);
mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical, false));

// add a proper item divider to the RecyclerView when Reader Improvements are enabled
if (mReaderImprovementsFeatureConfig.isEnabled()) {
mRecyclerView.addItemDivider(R.drawable.default_list_divider);
}
// add a proper item divider to the RecyclerView
mRecyclerView.addItemDivider(R.drawable.default_list_divider);

mRecyclerView.setToolbarBackgroundColor(0);
mRecyclerView.setToolbarSpinnerDrawable(R.drawable.ic_dropdown_primary_30_24dp);
Expand Down
19 changes: 7 additions & 12 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
import org.wordpress.android.util.NetworkUtilsWrapper;
import org.wordpress.android.util.SiteUtils;
import org.wordpress.android.util.ToastUtils;
import org.wordpress.android.util.config.ReaderImprovementsFeatureConfig;
import org.wordpress.android.util.extensions.ContextExtensionsKt;
import org.wordpress.android.util.image.BlavatarShape;
import org.wordpress.android.util.image.ImageManager;
Expand Down Expand Up @@ -135,7 +134,6 @@ public class ReaderPostAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
@Inject ReaderPostUiStateBuilder mReaderPostUiStateBuilder;
@Inject ReaderPostMoreButtonUiStateBuilder mReaderPostMoreButtonUiStateBuilder;
@Inject ReaderTracker mReaderTracker;
@Inject ReaderImprovementsFeatureConfig mReaderImprovementsFeatureConfig;
@Inject ReaderAnnouncementHelper mReaderAnnouncementHelper;

public String getSource() {
Expand Down Expand Up @@ -278,20 +276,17 @@ public int getItemViewType(int position) {
return new GapMarkerViewHolder(new ReaderGapMarkerView(context));

case VIEW_TYPE_XPOST:
final int layoutRestId = mReaderImprovementsFeatureConfig.isEnabled()
? R.layout.reader_cardview_xpost_new : R.layout.reader_cardview_xpost;
postView = LayoutInflater.from(context).inflate(layoutRestId, parent, false);
postView = LayoutInflater.from(context).inflate(R.layout.reader_cardview_xpost, parent, false);
return new ReaderXPostViewHolder(postView);
case VIEW_TYPE_REMOVED_POST:
final int layoutResId = mReaderImprovementsFeatureConfig.isEnabled()
? R.layout.reader_cardview_removed_post_new : R.layout.reader_cardview_removed_post;
postView = LayoutInflater.from(context).inflate(layoutResId, parent, false);
postView = LayoutInflater.from(context).inflate(
R.layout.reader_cardview_removed_post, parent, false
);
return new ReaderRemovedPostViewHolder(postView);
default:
return mReaderImprovementsFeatureConfig.isEnabled()
? new ReaderPostNewViewHolder(mUiHelpers, mImageManager, mReaderTracker, mNetworkUtilsWrapper,
parent)
: new ReaderPostViewHolder(mUiHelpers, mImageManager, mReaderTracker, parent);
return new ReaderPostNewViewHolder(
mUiHelpers, mImageManager, mReaderTracker, mNetworkUtilsWrapper, parent
);
}
}

Expand Down
38 changes: 9 additions & 29 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ 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
import org.wordpress.android.ui.reader.discover.viewholders.ReaderRecommendedBlogsCardViewHolder
import org.wordpress.android.ui.reader.discover.viewholders.ReaderViewHolder
import org.wordpress.android.ui.reader.tracker.ReaderTracker
import org.wordpress.android.ui.utils.HideItemDivider
Expand All @@ -33,7 +31,6 @@ class ReaderDiscoverAdapter(
private val imageManager: ImageManager,
private val readerTracker: ReaderTracker,
private val networkUtilsWrapper: NetworkUtilsWrapper,
private val isReaderImprovementsEnabled: Boolean,
) : Adapter<ReaderViewHolder<*>>() {
private val items = mutableListOf<ReaderCardUiState>()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReaderViewHolder<*> {
Expand All @@ -47,24 +44,9 @@ class ReaderDiscoverAdapter(
parent
)

INTEREST_VIEW_TYPE -> {
if (isReaderImprovementsEnabled) {
ReaderInterestsCardNewViewHolder(uiHelpers, parent)
} else {
ReaderInterestsCardViewHolder(uiHelpers, parent)
}
}
INTEREST_VIEW_TYPE -> ReaderInterestsCardViewHolder(uiHelpers, parent)

RECOMMENDED_BLOGS_VIEW_TYPE ->
if (isReaderImprovementsEnabled) {
ReaderRecommendedBlogsCardNewViewHolder(
parent, imageManager
)
} else {
ReaderRecommendedBlogsCardViewHolder(
parent, imageManager, uiHelpers
)
}
RECOMMENDED_BLOGS_VIEW_TYPE -> ReaderRecommendedBlogsCardNewViewHolder(parent, imageManager)

READER_ANNOUNCEMENT_TYPE -> ReaderAnnouncementCardViewHolder(parent)

Expand All @@ -75,15 +57,13 @@ class ReaderDiscoverAdapter(
override fun getItemCount(): Int = items.size

override fun onBindViewHolder(holder: ReaderViewHolder<*>, position: Int) {
if (isReaderImprovementsEnabled) {
// hide the item divider by setting the HideItemDivider object as view tag, which is used by the
// DividerItemDecorator to skip drawing the bottom divider for the item. It should be hidden for any
// recommendation cards and cards above them.
val nextPosition = position + 1
val shouldHideDivider = isRecommendationCard(position) ||
(nextPosition < itemCount && isRecommendationCard(nextPosition))
holder.itemView.tag = HideItemDivider.takeIf { shouldHideDivider }
}
// hide the item divider by setting the HideItemDivider object as view tag, which is used by the
// DividerItemDecorator to skip drawing the bottom divider for the item. It should be hidden for any
// recommendation cards and cards above them.
val nextPosition = position + 1
val shouldHideDivider = isRecommendationCard(position) ||
(nextPosition < itemCount && isRecommendationCard(nextPosition))
holder.itemView.tag = HideItemDivider.takeIf { shouldHideDivider }

holder.onBind(items[position])
}
Expand Down
21 changes: 3 additions & 18 deletions WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import org.wordpress.android.ui.utils.UiHelpers
import org.wordpress.android.ui.utils.addItemDivider
import org.wordpress.android.util.NetworkUtilsWrapper
import org.wordpress.android.util.WPSwipeToRefreshHelper
import org.wordpress.android.util.config.ReaderImprovementsFeatureConfig
import org.wordpress.android.util.image.ImageManager
import org.wordpress.android.viewmodel.observeEvent
import org.wordpress.android.widgets.RecyclerItemDecoration
Expand Down Expand Up @@ -80,9 +79,6 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme

private lateinit var parentViewModel: ReaderViewModel

@Inject
lateinit var readerImprovementsFeatureConfig: ReaderImprovementsFeatureConfig

private var binding: ReaderDiscoverFragmentLayoutBinding? = null

override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -100,31 +96,20 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme
imageManager,
readerTracker,
networkUtilsWrapper,
readerImprovementsFeatureConfig.isEnabled()
)

// set the background color as we have different colors for the new and legacy designs that are not easy to
// change via styles, because of the FeatureConfig logic
val backgroundColor = if (readerImprovementsFeatureConfig.isEnabled()) {
R.color.reader_post_list_background_new
} else {
R.color.reader_post_list_background
}
val backgroundColor = R.color.reader_post_list_background
recyclerView.setBackgroundColor(ContextCompat.getColor(requireContext(), backgroundColor))

val spacingVerticalRes = if (readerImprovementsFeatureConfig.isEnabled()) {
R.dimen.reader_card_gutters_new
} else {
R.dimen.reader_card_gutters
}
val spacingVerticalRes = R.dimen.reader_card_gutters
val spacingHorizontal = resources.getDimensionPixelSize(R.dimen.reader_card_margin)
val spacingVertical = resources.getDimensionPixelSize(spacingVerticalRes)
recyclerView.addItemDecoration(RecyclerItemDecoration(spacingHorizontal, spacingVertical, false))

// add a proper item divider to the RecyclerView when Reader Improvements are enabled
if (readerImprovementsFeatureConfig.isEnabled()) {
recyclerView.addItemDivider(R.drawable.default_list_divider)
}
recyclerView.addItemDivider(R.drawable.default_list_divider)

WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(ptrLayout) { viewModel.swipeToRefresh() }

Expand Down
Loading
Loading