mirror of
https://github.com/bitwarden/android.git
synced 2025-02-21 16:19:17 +03:00
PM-14201: Update the default divider thickness (#4182)
This commit is contained in:
parent
f3916b4ef6
commit
150c8e0312
5 changed files with 3 additions and 8 deletions
app/src/main/java/com/x8bit/bitwarden/ui/platform
base/util
components
|
@ -1,7 +1,6 @@
|
||||||
package com.x8bit.bitwarden.ui.platform.base.util
|
package com.x8bit.bitwarden.ui.platform.base.util
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.DividerDefaults
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.TopAppBarScrollBehavior
|
import androidx.compose.material3.TopAppBarScrollBehavior
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
@ -71,7 +70,6 @@ fun Modifier.scrolledContainerBottomDivider(
|
||||||
this.bottomDivider(
|
this.bottomDivider(
|
||||||
alpha = topAppBarScrollBehavior.toScrolledContainerDividerAlpha(),
|
alpha = topAppBarScrollBehavior.toScrolledContainerDividerAlpha(),
|
||||||
enabled = enabled,
|
enabled = enabled,
|
||||||
thickness = (0.5).dp,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -83,7 +81,7 @@ fun Modifier.scrolledContainerBottomDivider(
|
||||||
fun Modifier.bottomDivider(
|
fun Modifier.bottomDivider(
|
||||||
paddingStart: Dp = 0.dp,
|
paddingStart: Dp = 0.dp,
|
||||||
paddingEnd: Dp = 0.dp,
|
paddingEnd: Dp = 0.dp,
|
||||||
thickness: Dp = DividerDefaults.Thickness,
|
thickness: Dp = (0.5).dp,
|
||||||
color: Color = BitwardenTheme.colorScheme.stroke.divider,
|
color: Color = BitwardenTheme.colorScheme.stroke.divider,
|
||||||
enabled: Boolean = true,
|
enabled: Boolean = true,
|
||||||
alpha: Float = 1f,
|
alpha: Float = 1f,
|
||||||
|
|
|
@ -73,7 +73,6 @@ fun BitwardenMediumTopAppBar(
|
||||||
TopAppBarDividerStyle.STATIC -> true
|
TopAppBarDividerStyle.STATIC -> true
|
||||||
TopAppBarDividerStyle.ON_SCROLL -> false
|
TopAppBarDividerStyle.ON_SCROLL -> false
|
||||||
},
|
},
|
||||||
thickness = (0.5).dp,
|
|
||||||
),
|
),
|
||||||
actions = actions,
|
actions = actions,
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,7 +17,6 @@ import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.testTag
|
import androidx.compose.ui.platform.testTag
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.input.ImeAction
|
import androidx.compose.ui.text.input.ImeAction
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import com.x8bit.bitwarden.R
|
import com.x8bit.bitwarden.R
|
||||||
import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider
|
import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider
|
||||||
import com.x8bit.bitwarden.ui.platform.base.util.mirrorIfRtl
|
import com.x8bit.bitwarden.ui.platform.base.util.mirrorIfRtl
|
||||||
|
@ -49,7 +48,7 @@ fun BitwardenSearchTopAppBar(
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.testTag(tag = "HeaderBarComponent")
|
.testTag(tag = "HeaderBarComponent")
|
||||||
.bottomDivider(thickness = (0.5).dp),
|
.bottomDivider(),
|
||||||
colors = bitwardenTopAppBarColors(),
|
colors = bitwardenTopAppBarColors(),
|
||||||
scrollBehavior = scrollBehavior,
|
scrollBehavior = scrollBehavior,
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
|
|
|
@ -125,7 +125,6 @@ fun BitwardenTopAppBar(
|
||||||
TopAppBarDividerStyle.STATIC -> true
|
TopAppBarDividerStyle.STATIC -> true
|
||||||
TopAppBarDividerStyle.ON_SCROLL -> false
|
TopAppBarDividerStyle.ON_SCROLL -> false
|
||||||
},
|
},
|
||||||
thickness = (0.5).dp,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (titleTextHasOverflow) {
|
if (titleTextHasOverflow) {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
|
||||||
@Composable
|
@Composable
|
||||||
fun BitwardenHorizontalDivider(
|
fun BitwardenHorizontalDivider(
|
||||||
modifier: Modifier = Modifier,
|
modifier: Modifier = Modifier,
|
||||||
thickness: Dp = 1.dp,
|
thickness: Dp = (0.5).dp,
|
||||||
color: Color = BitwardenTheme.colorScheme.stroke.divider,
|
color: Color = BitwardenTheme.colorScheme.stroke.divider,
|
||||||
) {
|
) {
|
||||||
HorizontalDivider(
|
HorizontalDivider(
|
||||||
|
|
Loading…
Add table
Reference in a new issue