@@ -9,16 +9,12 @@ package io.element.android.features.space.impl.root
99
1010import androidx.compose.foundation.interaction.MutableInteractionSource
1111import androidx.compose.foundation.layout.Box
12- import androidx.compose.foundation.layout.Column
1312import androidx.compose.foundation.layout.Row
14- import androidx.compose.foundation.layout.Spacer
1513import androidx.compose.foundation.layout.fillMaxSize
1614import androidx.compose.foundation.layout.fillMaxWidth
17- import androidx.compose.foundation.layout.height
1815import androidx.compose.foundation.layout.padding
1916import androidx.compose.foundation.lazy.LazyColumn
2017import androidx.compose.material3.ExperimentalMaterial3Api
21- import androidx.compose.material3.rememberModalBottomSheetState
2218import androidx.compose.runtime.Composable
2319import androidx.compose.runtime.LaunchedEffect
2420import androidx.compose.runtime.getValue
@@ -39,6 +35,7 @@ import io.element.android.compound.theme.ElementTheme
3935import io.element.android.compound.tokens.generated.CompoundIcons
4036import io.element.android.libraries.designsystem.atomic.molecules.InviteButtonsRowMolecule
4137import io.element.android.libraries.designsystem.components.ClickableLinkText
38+ import io.element.android.libraries.designsystem.components.SimpleModalBottomSheet
4239import io.element.android.libraries.designsystem.components.async.AsyncIndicator
4340import io.element.android.libraries.designsystem.components.async.AsyncIndicatorHost
4441import io.element.android.libraries.designsystem.components.async.rememberAsyncIndicatorState
@@ -54,7 +51,6 @@ import io.element.android.libraries.designsystem.theme.components.DropdownMenu
5451import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
5552import io.element.android.libraries.designsystem.theme.components.Icon
5653import io.element.android.libraries.designsystem.theme.components.IconButton
57- import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
5854import io.element.android.libraries.designsystem.theme.components.Scaffold
5955import io.element.android.libraries.designsystem.theme.components.Text
6056import io.element.android.libraries.designsystem.theme.components.TopAppBar
@@ -139,36 +135,23 @@ private fun JoinRoomFailureEffect(
139135 }
140136}
141137
142- @OptIn(ExperimentalMaterial3Api ::class )
143138@Composable
144139private fun TopicViewerBottomSheet (
145140 topicViewerState : TopicViewerState .Shown ,
146141 onDismiss : () -> Unit ,
147142 modifier : Modifier = Modifier ,
148143) {
149- ModalBottomSheet (
150- onDismissRequest = onDismiss ,
151- modifier = modifier ,
152- sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true ),
144+ SimpleModalBottomSheet (
145+ title = stringResource( CommonStrings .common_description) ,
146+ onDismiss = onDismiss ,
147+ modifier = modifier
153148 ) {
154- Column (
155- modifier = Modifier
156- .fillMaxWidth()
157- .padding(16 .dp),
158- ) {
159- Text (
160- stringResource(CommonStrings .common_description),
161- style = ElementTheme .typography.fontBodyLgMedium,
162- color = ElementTheme .colors.textPrimary,
163- )
164- Spacer (Modifier .height(8 .dp))
165- ClickableLinkText (
166- text = topicViewerState.topic,
167- interactionSource = remember { MutableInteractionSource () },
168- style = ElementTheme .typography.fontBodyMdRegular,
169- color = ElementTheme .colors.textSecondary,
170- )
171- }
149+ ClickableLinkText (
150+ text = topicViewerState.topic,
151+ interactionSource = remember { MutableInteractionSource () },
152+ style = ElementTheme .typography.fontBodyMdRegular,
153+ color = ElementTheme .colors.textSecondary,
154+ )
172155 }
173156}
174157
0 commit comments