Fix task list chip group bottom padding

pull/1917/head
Alex Baker 2 years ago
parent 1fbc2b1661
commit fcda6efe0c

@ -48,7 +48,8 @@ class TaskViewHolder internal constructor(
private val metrics: DisplayMetrics, private val metrics: DisplayMetrics,
private val background: Int, private val background: Int,
private val selectedColor: Int, private val selectedColor: Int,
private val rowPadding: Int, private val rowPaddingDp: Int,
private val rowPaddingPx: Int,
private val linkify: Linkify, private val linkify: Linkify,
private val locale: Locale, private val locale: Locale,
private val markdown: Markdown private val markdown: Markdown
@ -164,15 +165,14 @@ class TaskViewHolder internal constructor(
} }
when { when {
chipGroup.visibility == View.VISIBLE -> { chipGroup.visibility == View.VISIBLE -> {
setBottomPadding(rowPadding, chipGroup)
setBottomPadding(0, description, nameView) setBottomPadding(0, description, nameView)
} }
description.visibility == View.VISIBLE -> { description.visibility == View.VISIBLE -> {
setBottomPadding(rowPadding, description) setBottomPadding(rowPaddingPx, description)
setBottomPadding(0, nameView) setBottomPadding(0, nameView)
} }
else -> { else -> {
setBottomPadding(rowPadding, nameView) setBottomPadding(rowPaddingPx, nameView)
} }
} }
} }
@ -218,7 +218,12 @@ class TaskViewHolder internal constructor(
private fun setupChips(filter: Filter, sortByStartDate: Boolean) { private fun setupChips(filter: Filter, sortByStartDate: Boolean) {
chipGroup.setContent { chipGroup.setContent {
MdcTheme { MdcTheme {
ChipGroup(modifier = Modifier.padding(end = 16.dp)) { ChipGroup(
modifier = Modifier.padding(
end = 16.dp,
bottom = rowPaddingDp.dp
)
) {
chipProvider.Chips( chipProvider.Chips(
filter = filter, filter = filter,
isSubtask = indent > 0, isSubtask = indent > 0,
@ -274,8 +279,8 @@ class TaskViewHolder internal constructor(
description.isSingleLine = false description.isSingleLine = false
description.ellipsize = null description.ellipsize = null
} }
setTopPadding(rowPadding, nameView, completeBox, dueDate) setTopPadding(rowPaddingPx, nameView, completeBox, dueDate)
setBottomPadding(rowPadding, completeBox, dueDate) setBottomPadding(rowPaddingPx, completeBox, dueDate)
nameView.textSize = fontSize.toFloat() nameView.textSize = fontSize.toFloat()
description.textSize = fontSize.toFloat() description.textSize = fontSize.toFloat()
val fontSizeDetails = max(10, fontSize - 2) val fontSizeDetails = max(10, fontSize - 2)

@ -32,7 +32,8 @@ class ViewHolderFactory @Inject constructor(
private val metrics: DisplayMetrics = context.resources.displayMetrics private val metrics: DisplayMetrics = context.resources.displayMetrics
private val background: Int = ResourceResolver.getResourceId(context, R.attr.selectableItemBackground) private val background: Int = ResourceResolver.getResourceId(context, R.attr.selectableItemBackground)
private val selectedColor: Int = ResourceResolver.getData(context, R.attr.colorControlHighlight) private val selectedColor: Int = ResourceResolver.getData(context, R.attr.colorControlHighlight)
private val rowPadding: Int = AndroidUtilities.convertDpToPixels(metrics, preferences.getInt(R.string.p_rowPadding, 16)) private val rowPaddingDp = preferences.getInt(R.string.p_rowPadding, 16)
private val rowPaddingPx: Int = AndroidUtilities.convertDpToPixels(metrics, rowPaddingDp)
private val markdown = private val markdown =
MarkdownProvider(context, preferences).markdown(R.string.p_linkify_task_list) MarkdownProvider(context, preferences).markdown(R.string.p_linkify_task_list)
@ -57,7 +58,8 @@ class ViewHolderFactory @Inject constructor(
metrics, metrics,
background, background,
selectedColor, selectedColor,
rowPadding, rowPaddingDp,
rowPaddingPx,
linkify, linkify,
locale, locale,
markdown markdown

Loading…
Cancel
Save