Skip to content

Commit 20bdf98

Browse files
csmithcsmith
authored
Merge pull request #824 from vector-im/misc/cjs/left-align-top-bars
2 parents bfc8509 + 8940ba1 commit 20bdf98

File tree

90 files changed

+175
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+175
-240
lines changed

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import io.element.android.features.createroom.impl.userlist.UserListState
3838
import io.element.android.libraries.designsystem.components.button.BackButton
3939
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4040
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
41-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
4241
import io.element.android.libraries.designsystem.theme.components.Scaffold
4342
import io.element.android.libraries.designsystem.theme.components.Text
4443
import io.element.android.libraries.designsystem.theme.components.TextButton
44+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
4545
import io.element.android.libraries.ui.strings.CommonStrings
4646

4747
@OptIn(ExperimentalLayoutApi::class)
@@ -92,7 +92,7 @@ fun AddPeopleViewTopBar(
9292
onBackPressed: () -> Unit = {},
9393
onNextPressed: () -> Unit = {},
9494
) {
95-
CenterAlignedTopAppBar(
95+
TopAppBar(
9696
modifier = modifier,
9797
title = {
9898
Text(

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ import io.element.android.libraries.designsystem.components.button.BackButton
5757
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
5858
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5959
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
60-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
6160
import io.element.android.libraries.designsystem.theme.components.Scaffold
6261
import io.element.android.libraries.designsystem.theme.components.Text
6362
import io.element.android.libraries.designsystem.theme.components.TextButton
63+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
6464
import io.element.android.libraries.matrix.api.core.RoomId
6565
import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
6666
import io.element.android.libraries.matrix.ui.components.SelectedUsersList
@@ -181,7 +181,7 @@ fun ConfigureRoomToolbar(
181181
onBackPressed: () -> Unit = {},
182182
onNextPressed: () -> Unit = {},
183183
) {
184-
CenterAlignedTopAppBar(
184+
TopAppBar(
185185
modifier = modifier,
186186
title = {
187187
Text(

‎features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ import io.element.android.libraries.designsystem.components.ProgressDialog
4848
import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
4949
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5050
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
51-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
5251
import io.element.android.libraries.designsystem.theme.components.Icon
5352
import io.element.android.libraries.designsystem.theme.components.IconButton
5453
import io.element.android.libraries.designsystem.theme.components.Scaffold
5554
import io.element.android.libraries.designsystem.theme.components.Text
55+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
5656
import io.element.android.libraries.matrix.api.core.RoomId
5757
import io.element.android.libraries.ui.strings.CommonStrings
5858
import io.element.android.libraries.designsystem.R as DrawableR
@@ -133,7 +133,7 @@ fun CreateRoomRootViewTopBar(
133133
modifier: Modifier = Modifier,
134134
onClosePressed: () -> Unit = {},
135135
) {
136-
CenterAlignedTopAppBar(
136+
TopAppBar(
137137
modifier = modifier,
138138
title = {
139139
Text(
@@ -142,7 +142,7 @@ fun CreateRoomRootViewTopBar(
142142
fontWeight = FontWeight.SemiBold,
143143
)
144144
},
145-
actions = {
145+
navigationIcon = {
146146
IconButton(onClick = onClosePressed) {
147147
Icon(
148148
imageVector = Icons.Default.Close,

‎features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ import io.element.android.libraries.designsystem.components.button.BackButton
4848
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4949
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
5050
import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
51-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
5251
import io.element.android.libraries.designsystem.theme.components.Icon
5352
import io.element.android.libraries.designsystem.theme.components.Text
53+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
5454
import io.element.android.libraries.ui.strings.CommonStrings
5555
import io.element.android.libraries.designsystem.R as DesignSystemR
5656

@@ -91,7 +91,7 @@ fun SendLocationView(
9191
sheetDragHandle = {},
9292
sheetSwipeEnabled = false,
9393
topBar = {
94-
CenterAlignedTopAppBar(
94+
TopAppBar(
9595
title = {
9696
Text(
9797
text = stringResource(CommonStrings.screen_share_location_title),

‎features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import io.element.android.features.location.impl.map.rememberMapState
3939
import io.element.android.libraries.designsystem.components.button.BackButton
4040
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4141
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
42-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
4342
import io.element.android.libraries.designsystem.theme.components.Icon
4443
import io.element.android.libraries.designsystem.theme.components.IconButton
4544
import io.element.android.libraries.designsystem.theme.components.Scaffold
4645
import io.element.android.libraries.designsystem.theme.components.Text
46+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
4747
import io.element.android.libraries.theme.compound.generated.TypographyTokens
4848
import io.element.android.libraries.ui.strings.CommonStrings
4949

@@ -61,7 +61,7 @@ fun ShowLocationView(
6161

6262
Scaffold(modifier,
6363
topBar = {
64-
CenterAlignedTopAppBar(
64+
TopAppBar(
6565
title = {
6666
Text(
6767
text = stringResource(CommonStrings.screen_view_location_title),

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
5454
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults
5555
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5656
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
57-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
5857
import io.element.android.libraries.designsystem.theme.components.Divider
5958
import io.element.android.libraries.designsystem.theme.components.RadioButton
6059
import io.element.android.libraries.designsystem.theme.components.Scaffold
6160
import io.element.android.libraries.designsystem.theme.components.SearchBar
6261
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
6362
import io.element.android.libraries.designsystem.theme.components.Text
6463
import io.element.android.libraries.designsystem.theme.components.TextButton
64+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
6565
import io.element.android.libraries.designsystem.theme.roomListRoomMessage
6666
import io.element.android.libraries.designsystem.theme.roomListRoomName
6767
import io.element.android.libraries.matrix.api.core.RoomId
@@ -111,7 +111,7 @@ fun ForwardMessagesView(
111111
Scaffold(
112112
modifier = modifier,
113113
topBar = {
114-
CenterAlignedTopAppBar(
114+
TopAppBar(
115115
title = { Text(stringResource(CommonStrings.common_forward_message), style = ElementTextStyles.Bold.callout) },
116116
navigationIcon = {
117117
BackButton(onClick = { onBackButton(state) })

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ import io.element.android.libraries.designsystem.components.button.ButtonWithPro
5050
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
5151
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5252
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
53-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
5453
import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
5554
import io.element.android.libraries.designsystem.theme.components.Scaffold
5655
import io.element.android.libraries.designsystem.theme.components.Text
56+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
5757
import io.element.android.libraries.ui.strings.CommonStrings
5858

5959
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@@ -83,7 +83,7 @@ fun ReportMessageView(
8383

8484
Scaffold(
8585
topBar = {
86-
CenterAlignedTopAppBar(
86+
TopAppBar(
8787
title = {
8888
Text(
8989
stringResource(CommonStrings.action_report_content),

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ import io.element.android.libraries.designsystem.components.button.BackButton
6868
import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
6969
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
7070
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
71-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
7271
import io.element.android.libraries.designsystem.theme.components.Icon
7372
import io.element.android.libraries.designsystem.theme.components.Scaffold
7473
import io.element.android.libraries.designsystem.theme.components.Text
7574
import io.element.android.libraries.designsystem.theme.components.TextButton
75+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
7676
import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
7777
import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
7878
import io.element.android.libraries.ui.strings.CommonStrings
@@ -102,7 +102,7 @@ fun RoomDetailsEditView(
102102
Scaffold(
103103
modifier = modifier.clearFocusOnTap(focusManager),
104104
topBar = {
105-
CenterAlignedTopAppBar(
105+
TopAppBar(
106106
title = {
107107
Text(
108108
text = stringResource(id = R.string.screen_room_details_edit_room_title),

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
3939
import io.element.android.libraries.designsystem.components.button.BackButton
4040
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
4141
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
42-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
4342
import io.element.android.libraries.designsystem.theme.components.Divider
4443
import io.element.android.libraries.designsystem.theme.components.Scaffold
4544
import io.element.android.libraries.designsystem.theme.components.SearchBar
4645
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
4746
import io.element.android.libraries.designsystem.theme.components.Text
4847
import io.element.android.libraries.designsystem.theme.components.TextButton
48+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
4949
import io.element.android.libraries.matrix.api.user.MatrixUser
5050
import io.element.android.libraries.matrix.ui.components.CheckableUnresolvedUserRow
5151
import io.element.android.libraries.matrix.ui.components.CheckableUserRow
@@ -117,7 +117,7 @@ fun RoomInviteMembersTopBar(
117117
onBackPressed: () -> Unit = {},
118118
onSendPressed: () -> Unit = {},
119119
) {
120-
CenterAlignedTopAppBar(
120+
TopAppBar(
121121
modifier = modifier,
122122
title = {
123123
Text(

‎features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
4949
import io.element.android.libraries.designsystem.components.button.BackButton
5050
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
5151
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
52-
import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
5352
import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
5453
import io.element.android.libraries.designsystem.theme.components.Scaffold
5554
import io.element.android.libraries.designsystem.theme.components.SearchBar
5655
import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
5756
import io.element.android.libraries.designsystem.theme.components.Text
5857
import io.element.android.libraries.designsystem.theme.components.TextButton
58+
import io.element.android.libraries.designsystem.theme.components.TopAppBar
5959
import io.element.android.libraries.matrix.api.core.UserId
6060
import io.element.android.libraries.matrix.api.room.RoomMember
6161
import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -203,7 +203,7 @@ private fun RoomMemberListTopBar(
203203
onBackPressed: () -> Unit = {},
204204
onInvitePressed: () -> Unit = {},
205205
) {
206-
CenterAlignedTopAppBar(
206+
TopAppBar(
207207
modifier = modifier,
208208
title = {
209209
Text(

0 commit comments

Comments
 (0)