Skip to content

[Site Design Revamp] Remove category filter pills #16428

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

Merged
ovitrif merged 4 commits into from
May 3, 2022
Merged

[Site Design Revamp] Remove category filter pills #16428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
24ee21f
Hide the category pills recyclerview and skeleton view
ovitrif Apr 27, 2022
9f44324
Set text alignment of the big title to the left of the screen
ovitrif Apr 27, 2022
69b4968
Add horizontal padding to the big title to align it with the preview …
ovitrif Apr 27, 2022
92fcbc5
Align collapsed title text to left of Site Theme screen
ovitrif May 2, 2022
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
32 changes: 8 additions & 24 deletions ...Press/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,15 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.ViewCompat
import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.appbar.AppBarLayout
import org.wordpress.android.R
import org.wordpress.android.WordPress
import org.wordpress.android.databinding.HomePagePickerFragmentBinding
import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Dismiss
Expand All @@ -25,9 +23,8 @@ import org.wordpress.android.ui.utils.UiHelpers
import org.wordpress.android.util.DisplayUtilsWrapper
import org.wordpress.android.util.ToastUtils
import org.wordpress.android.util.config.SiteNameFeatureConfig
import org.wordpress.android.util.image.ImageManager
import org.wordpress.android.util.extensions.setVisible
import org.wordpress.android.viewmodel.observeEvent
import org.wordpress.android.util.image.ImageManager
import javax.inject.Inject

/**
Expand Down Expand Up @@ -61,17 +58,8 @@ class HomePagePickerFragment : Fragment() {
viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)

with(HomePagePickerFragmentBinding.bind(view)) {
categoriesRecyclerView.apply {
layoutManager = LinearLayoutManager(
context,
RecyclerView.HORIZONTAL,
false
)
setRecycledViewPool(RecyclerView.RecycledViewPool())
adapter = CategoriesAdapter()
ViewCompat.setNestedScrollingEnabled(this, false)
}

modalLayoutPickerCategoriesSkeleton.root.isGone = true
categoriesRecyclerView.isGone = true
layoutsRecyclerView.apply {
layoutManager = LinearLayoutManager(requireActivity())
adapter = LayoutCategoryAdapter(viewModel.nestedScrollStates)
Expand All @@ -86,7 +74,10 @@ class HomePagePickerFragment : Fragment() {
private fun HomePagePickerFragmentBinding.setupUi() {
homePagePickerTitlebar.title.isInvisible = !displayUtils.isPhoneLandscape()
with(modalLayoutPickerHeaderSection) {
modalLayoutPickerTitleRow?.header?.setText(R.string.hpp_title)
modalLayoutPickerTitleRow?.header?.apply {
textAlignment = View.TEXT_ALIGNMENT_TEXT_START
setText(R.string.hpp_title)
}
modalLayoutPickerSubtitleRow?.root?.visibility = View.GONE
}
}
Expand All @@ -99,7 +90,6 @@ class HomePagePickerFragment : Fragment() {
is LayoutPickerUiState.Loading -> { // Nothing more to do here
}
is LayoutPickerUiState.Content -> {
(categoriesRecyclerView.adapter as CategoriesAdapter).setData(uiState.categories)
(layoutsRecyclerView.adapter as? LayoutCategoryAdapter)?.update(uiState.layoutCategories)
}
is LayoutPickerUiState.Error -> {
Expand All @@ -122,10 +112,6 @@ class HomePagePickerFragment : Fragment() {
}
}

viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner) {
layoutsRecyclerView.smoothScrollToPosition(0)
}

viewModel.start(displayUtils.isTablet())
}

Expand All @@ -138,8 +124,6 @@ class HomePagePickerFragment : Fragment() {
}

private fun HomePagePickerFragmentBinding.setContentVisibility(skeleton: Boolean, error: Boolean) {
modalLayoutPickerCategoriesSkeleton.categoriesSkeleton.setVisible(skeleton)
categoriesRecyclerView.setVisible(!skeleton && !error)
modalLayoutPickerLayoutsSkeleton.layoutsSkeleton.setVisible(skeleton)
layoutsRecyclerView.setVisible(!skeleton && !error)
errorView.setVisible(error)
Expand Down
1 change: 1 addition & 0 deletions WordPress/src/main/res/layout/home_page_picker_titlebar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
style="@style/ModalLayoutPickerHeader"
android:layout_width="0dp"
android:layout_weight="1"
android:textAlignment="textStart"
android:paddingStart="@dimen/hpp_title_padding_start"
android:paddingEnd="0dp"
android:text="@string/hpp_title" />
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@
<dimen name="mlp_layout_skeleton_line_width">100dp</dimen>

<!-- Home Page Picker -->
<dimen name="hpp_title_padding_start">@dimen/margin_extra_extra_medium_large</dimen>
<dimen name="hpp_title_padding_start">@dimen/margin_none</dimen>

<!-- Site Intent Question -->
<dimen name="siq_title_padding_start">@dimen/margin_extra_extra_large</dimen>
Expand Down
2 changes: 2 additions & 0 deletions WordPress/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,8 @@
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
<item name="android:paddingBottom">@dimen/margin_small_medium</item>
<item name="android:paddingStart">@dimen/margin_extra_large</item>
<item name="android:paddingEnd">@dimen/margin_extra_large</item>
<item name="android:maxLines">3</item>
<item name="fontFamily">serif</item>
</style>
Expand Down