Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #824 from vector-im/misc/cjs/left-align-top-bars

Browse source
This commit is contained in:
Chris Smith 2023-07-10 12:23:29 +01:00 • committed by GitHub
commit 20bdf98db6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
90 changed files with 175 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
View file

@ -48,9 +48,9 @@ import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.libraries.designsystem.R as DesignSystemR
@ -91,7 +91,7 @@ fun SendLocationView(
sheetDragHandle = {},
sheetSwipeEnabled = false,
topBar = {
CenterAlignedTopAppBar(
TopAppBar(
title = {
Text(
text = stringResource(CommonStrings.screen_share_location_title),

4
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
View file

@ -39,11 +39,11 @@ import io.element.android.features.location.impl.map.rememberMapState
import io.element.android.libraries.designsystem.components.button.BackButton
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
import io.element.android.libraries.designsystem.theme.components.Icon
import io.element.android.libraries.designsystem.theme.components.IconButton
import io.element.android.libraries.designsystem.theme.components.Scaffold
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TopAppBar
import io.element.android.libraries.theme.compound.generated.TypographyTokens
import io.element.android.libraries.ui.strings.CommonStrings
@ -61,7 +61,7 @@ fun ShowLocationView(
Scaffold(modifier,
topBar = {
CenterAlignedTopAppBar(
TopAppBar(
title = {
Text(
text = stringResource(CommonStrings.screen_view_location_title),