Skip to content

[Site Design Revamp] Main View - Hide layouts row separators #16488

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
antonis merged 3 commits into from
May 6, 2022
Merged

[Site Design Revamp] Main View - Hide layouts row separators #16488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfa6d16
Add id to divider view between layouts rows
ovitrif May 6, 2022
d8a612b
Add showDividers bool to layouts item view holder for showing/hiding …
ovitrif May 6, 2022
97aaf34
Hide layouts row separator on site design screen
ovitrif May 6, 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
6 changes: 4 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
class LayoutCategoryAdapter(
private var nestedScrollStates: Bundle,
private val thumbDimensionProvider: ThumbDimensionProvider,
private val recommendedDimensionProvider: ThumbDimensionProvider? = null
private val recommendedDimensionProvider: ThumbDimensionProvider? = null,
private val showRowDividers: Boolean = true
) : Adapter<LayoutsItemViewHolder>() {
private var items: List<LayoutCategoryUiState> = listOf()

Expand Down Expand Up @@ -42,7 +43,8 @@ class LayoutCategoryAdapter(
parent = parent,
nestedScrollStates = nestedScrollStates,
thumbDimensionProvider = thumbDimensionProvider,
recommendedDimensionProvider = recommendedDimensionProvider
recommendedDimensionProvider = recommendedDimensionProvider,
showRowDividers = showRowDividers
)

fun onRestoreInstanceState(savedInstanceState: Bundle) {
Expand Down
4 changes: 4 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package org.wordpress.android.ui.layoutpicker
import android.os.Bundle
import android.os.Parcelable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
Expand All @@ -18,6 +20,7 @@ import org.wordpress.android.util.extensions.setVisible
class LayoutsItemViewHolder(
parent: ViewGroup,
private val prefetchItemCount: Int = 4,
private val showRowDividers: Boolean,
private var nestedScrollStates: Bundle,
private val thumbDimensionProvider: ThumbDimensionProvider,
private val recommendedDimensionProvider: ThumbDimensionProvider?
Expand All @@ -35,6 +38,7 @@ class LayoutsItemViewHolder(
itemView.updateLayoutParams {
height = if (isRecommended) recommendedDimensionProvider!!.rowHeight else thumbDimensionProvider.rowHeight
}
itemView.findViewById<View>(R.id.layouts_row_separator_line).isVisible = showRowDividers
itemView.findViewById<RecyclerView>(R.id.layouts_recycler_view).apply {
layoutManager = LinearLayoutManager(
context,
Expand Down
3 changes: 2 additions & 1 deletion ...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 @@ -68,7 +68,8 @@ class HomePagePickerFragment : Fragment() {
adapter = LayoutCategoryAdapter(
viewModel.nestedScrollStates,
thumbDimensionProvider,
recommendedDimensionProvider
recommendedDimensionProvider,
showRowDividers = false
)
}

Expand Down
4 changes: 3 additions & 1 deletion WordPress/src/main/res/layout/modal_layout_picker_layouts_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
android:layout_height="@dimen/mlp_layouts_row_height"
android:orientation="vertical">

<View style="@style/ModalLayoutPickerLayoutsSeparatorLine" />
<View
android:id="@+id/layouts_row_separator_line"
style="@style/ModalLayoutPickerLayoutsSeparatorLine" />

<TextView
android:id="@+id/subtitle"
Expand Down