TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-04 17:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up spaces

Browse Source
This commit is contained in:
ThomasSession 2024-07-15 15:19:09 +10:00
parent a1fe1f1406
commit aabfb47f2b
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
View File

@ -113,15 +113,16 @@ private fun NotificationRadioButton(
), ),
) { ) {
Column(modifier = Modifier Column(modifier = Modifier
.padding(horizontal = 15.dp) .padding(horizontal = LocalDimensions.current.smallSpacing,
.padding(top = 10.dp, bottom = 11.dp)) { vertical = LocalDimensions.current.xsSpacing)
) {
Text(stringResource(title), style = LocalType.current.h8) 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 { tag?.let {
Text( Text(
stringResource(it), stringResource(it),
modifier = Modifier.padding(top = 6.dp), modifier = Modifier.padding(top = LocalDimensions.current.xxsSpacing),
color = LocalColors.current.primary, color = LocalColors.current.primary,
style = LocalType.current.h9 style = LocalType.current.h9
) )

9
app/src/main/java/org/thoughtcrime/securesms/ui/Carousel.kt
View File

@ -38,6 +38,7 @@ import androidx.compose.ui.unit.dp
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import network.loki.messenger.R import network.loki.messenger.R
import org.thoughtcrime.securesms.ui.theme.LocalColors 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.blackAlpha40
import org.thoughtcrime.securesms.ui.theme.pillShape import org.thoughtcrime.securesms.ui.theme.pillShape
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
@ -51,9 +52,9 @@ fun BoxScope.HorizontalPagerIndicator(pagerState: PagerState) {
backgroundColor = blackAlpha40, backgroundColor = blackAlpha40,
modifier = Modifier modifier = Modifier
.align(Alignment.BottomCenter) .align(Alignment.BottomCenter)
.padding(8.dp) .padding(LocalDimensions.current.xxsSpacing)
) { ) {
Box(modifier = Modifier.padding(8.dp)) { Box(modifier = Modifier.padding(LocalDimensions.current.xxsSpacing)) {
ClickableHorizontalPagerIndicator( ClickableHorizontalPagerIndicator(
pagerState = pagerState, pagerState = pagerState,
pageCount = pagerState.pageCount, pageCount = pagerState.pageCount,
@ -77,7 +78,7 @@ fun ClickableHorizontalPagerIndicator(
pageIndexMapping: (Int) -> Int = { it }, pageIndexMapping: (Int) -> Int = { it },
activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current), activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
inactiveColor: Color = activeColor.copy(ContentAlpha.disabled), inactiveColor: Color = activeColor.copy(ContentAlpha.disabled),
indicatorWidth: Dp = 8.dp, indicatorWidth: Dp = LocalDimensions.current.xxsSpacing,
indicatorHeight: Dp = indicatorWidth, indicatorHeight: Dp = indicatorWidth,
spacing: Dp = indicatorWidth, spacing: Dp = indicatorWidth,
indicatorShape: Shape = CircleShape, indicatorShape: Shape = CircleShape,
@ -119,7 +120,7 @@ private fun HorizontalPagerIndicator(
pageIndexMapping: (Int) -> Int = { it }, pageIndexMapping: (Int) -> Int = { it },
activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current), activeColor: Color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
inactiveColor: Color = activeColor.copy(ContentAlpha.disabled), inactiveColor: Color = activeColor.copy(ContentAlpha.disabled),
indicatorWidth: Dp = 8.dp, indicatorWidth: Dp = LocalDimensions.current.xxsSpacing,
indicatorHeight: Dp = indicatorWidth, indicatorHeight: Dp = indicatorWidth,
spacing: Dp = indicatorWidth, spacing: Dp = indicatorWidth,
indicatorShape: Shape = CircleShape, indicatorShape: Shape = CircleShape,