mirror of
https://github.com/oxen-io/session-android.git
synced 2025-03-28 22:12:13 +00:00
Cleaning up spaces
This commit is contained in:
parent
a1fe1f1406
commit
aabfb47f2b
@ -113,15 +113,16 @@ private fun NotificationRadioButton(
|
||||
),
|
||||
) {
|
||||
Column(modifier = Modifier
|
||||
.padding(horizontal = 15.dp)
|
||||
.padding(top = 10.dp, bottom = 11.dp)) {
|
||||
.padding(horizontal = LocalDimensions.current.smallSpacing,
|
||||
vertical = LocalDimensions.current.xsSpacing)
|
||||
) {
|
||||
Text(stringResource(title), style = LocalType.current.h8)
|
||||
|
||||
Text(stringResource(explanation), style = LocalType.current.small, modifier = Modifier.padding(top = 7.dp))
|
||||
Text(stringResource(explanation), style = LocalType.current.small, modifier = Modifier.padding(top = LocalDimensions.current.xxsSpacing))
|
||||
tag?.let {
|
||||
Text(
|
||||
stringResource(it),
|
||||
modifier = Modifier.padding(top = 6.dp),
|
||||
modifier = Modifier.padding(top = LocalDimensions.current.xxsSpacing),
|
||||
color = LocalColors.current.primary,
|
||||
style = LocalType.current.h9
|
||||
)
|
||||
|
@ -38,6 +38,7 @@ import androidx.compose.ui.unit.dp
|
||||
import kotlinx.coroutines.launch
|
||||
import network.loki.messenger.R
|
||||
import org.thoughtcrime.securesms.ui.theme.LocalColors
|
||||
import org.thoughtcrime.securesms.ui.theme.LocalDimensions
|
||||
import org.thoughtcrime.securesms.ui.theme.blackAlpha40
|
||||
import org.thoughtcrime.securesms.ui.theme.pillShape
|
||||
import kotlin.math.absoluteValue
|
||||
@ -51,9 +52,9 @@ fun BoxScope.HorizontalPagerIndicator(pagerState: PagerState) {
|
||||
backgroundColor = blackAlpha40,
|
||||
modifier = Modifier
|
||||
.align(Alignment.BottomCenter)
|
||||
.padding(8.dp)
|
||||
.padding(LocalDimensions.current.xxsSpacing)
|
||||
) {
|
||||
Box(modifier = Modifier.padding(8.dp)) {
|
||||
Box(modifier = Modifier.padding(LocalDimensions.current.xxsSpacing)) {
|
||||
ClickableHorizontalPagerIndicator(
|
||||
pagerState = pagerState,
|
||||
pageCount = pagerState.pageCount,
|
||||
@ -77,7 +78,7 @@ fun ClickableHorizontalPagerIndicator(
|
||||
pageIndexMapping: (Int) -> Int = { it },
|
||||
activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
|
||||
inactiveColor: Color = activeColor.copy(ContentAlpha.disabled),
|
||||
indicatorWidth: Dp = 8.dp,
|
||||
indicatorWidth: Dp = LocalDimensions.current.xxsSpacing,
|
||||
indicatorHeight: Dp = indicatorWidth,
|
||||
spacing: Dp = indicatorWidth,
|
||||
indicatorShape: Shape = CircleShape,
|
||||
@ -119,7 +120,7 @@ private fun HorizontalPagerIndicator(
|
||||
pageIndexMapping: (Int) -> Int = { it },
|
||||
activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
|
||||
inactiveColor: Color = activeColor.copy(ContentAlpha.disabled),
|
||||
indicatorWidth: Dp = 8.dp,
|
||||
indicatorWidth: Dp = LocalDimensions.current.xxsSpacing,
|
||||
indicatorHeight: Dp = indicatorWidth,
|
||||
spacing: Dp = indicatorWidth,
|
||||
indicatorShape: Shape = CircleShape,
|
||||
|
Loading…
x
Reference in New Issue
Block a user