BIT-842: Fix various paddings and sizes on Vault Screen (#489)

This commit is contained in:
Brian Yencho 2024-01-03 17:24:06 -06:00 committed by Álison Fernandes
parent d9837a1895
commit f2ccfcd59a
6 changed files with 41 additions and 9 deletions

View file

@ -30,6 +30,7 @@ fun BitwardenListHeaderTextWithSupportLabel(
.padding(
top = 12.dp,
bottom = 4.dp,
end = 8.dp,
)
.semantics(mergeDescendants = true) { },
horizontalArrangement = Arrangement.SpaceBetween,

View file

@ -42,7 +42,12 @@ fun VaultItemListingContent(
onClick = { vaultItemClick(it.id) },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
.padding(
start = 16.dp,
// There is some built-in padding to the menu button that makes up
// the visual difference here.
end = 12.dp,
),
)
}
}

View file

@ -61,7 +61,12 @@ fun VaultContent(
onClick = { vaultItemClick(favoriteItem) },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
.padding(
start = 16.dp,
// There is some built-in padding to the menu button that makes up
// the visual difference here.
end = 12.dp,
),
)
}

View file

@ -1,13 +1,16 @@
package com.x8bit.bitwarden.ui.vault.feature.vault
import android.widget.Toast
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -15,6 +18,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
@ -45,7 +49,8 @@ fun VaultEntryListItem(
indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
onClick = onClick,
)
.padding(vertical = 16.dp)
.defaultMinSize(minHeight = 72.dp)
.padding(vertical = 8.dp)
.then(modifier),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp),
@ -72,11 +77,19 @@ fun VaultEntryListItem(
}
}
Icon(
painter = painterResource(id = R.drawable.ic_more_horizontal),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
val context = LocalContext.current
IconButton(
onClick = {
// TODO: Provide dialog-based implementation (BIT-1353 - BIT-1356)
Toast.makeText(context, "Not yet implemented.", Toast.LENGTH_SHORT).show()
},
) {
Icon(
painter = painterResource(id = R.drawable.ic_more_horizontal),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}

View file

@ -5,6 +5,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@ -46,6 +47,7 @@ fun VaultGroupListItem(
onClick = onClick,
)
.padding(vertical = 16.dp)
.padding(end = 8.dp)
.then(modifier),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp),
@ -73,6 +75,7 @@ fun VaultGroupListItem(
painter = painterResource(id = R.drawable.ic_navigate_next),
contentDescription = null,
tint = MaterialTheme.colorScheme.onSurfaceVariant,
modifier = Modifier.size(24.dp),
)
}
}

View file

@ -318,7 +318,12 @@ private fun VaultScreenScaffold(
onVaultFilterTypeSelect = vaultFilterTypeSelect,
topAppBarScrollBehavior = scrollBehavior,
modifier = Modifier
.padding(horizontal = 16.dp)
.padding(
start = 16.dp,
// There is some built-in padding to the menu button that makes up
// the visual difference here.
end = 12.dp,
)
.fillMaxWidth(),
)