mirror of
https://github.com/bitwarden/android.git
synced 2024-11-27 03:49:36 +03:00
Replace Horizontal divider with modifier extension (#715)
This commit is contained in:
parent
e3d92966ac
commit
6c003c4102
2 changed files with 2 additions and 8 deletions
|
@ -21,6 +21,7 @@ import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.unit.dp
|
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.scrolledContainerBackground
|
import com.x8bit.bitwarden.ui.platform.base.util.scrolledContainerBackground
|
||||||
import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionDialog
|
import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionDialog
|
||||||
import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionRow
|
import com.x8bit.bitwarden.ui.platform.components.BitwardenSelectionRow
|
||||||
|
@ -70,6 +71,7 @@ fun VaultFilter(
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.scrolledContainerBackground(topAppBarScrollBehavior)
|
.scrolledContainerBackground(topAppBarScrollBehavior)
|
||||||
|
.bottomDivider(color = MaterialTheme.colorScheme.outlineVariant)
|
||||||
.padding(vertical = 8.dp)
|
.padding(vertical = 8.dp)
|
||||||
.then(modifier),
|
.then(modifier),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
|
|
@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.FloatingActionButton
|
import androidx.compose.material3.FloatingActionButton
|
||||||
import androidx.compose.material3.HorizontalDivider
|
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
|
@ -349,13 +348,6 @@ private fun VaultScreenScaffold(
|
||||||
)
|
)
|
||||||
.fillMaxWidth(),
|
.fillMaxWidth(),
|
||||||
)
|
)
|
||||||
|
|
||||||
HorizontalDivider(
|
|
||||||
thickness = 1.dp,
|
|
||||||
color = MaterialTheme.colorScheme.outlineVariant,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth(),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
when (val viewState = state.viewState) {
|
when (val viewState = state.viewState) {
|
||||||
|
|
Loading…
Reference in a new issue