microsoft
/
fluentui-android
зеркало из https://github.com/microsoft/fluentui-android.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

removing if condition for finding drawer height (#585) 

* removing if condition for finding drawer height

* adding alpha 0 to make the box disappear

---------

Co-authored-by: PraveenKumar <pyeruva@microsoft.com>
This commit is contained in:
PraveenKumar yeruva 2023-12-28 20:39:35 +05:30 коммит произвёл GitHub
Родитель c445de2c6b
Коммит 7bc81c0fa6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 109 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
FluentUI.Demo/src/main/AndroidManifest.xml
Просмотреть файл

@ -43,7 +43,8 @@
android:windowSoftInputMode="adjustResize" />
<activity android:name="com.microsoft.fluentuidemo.demos.V2DialogActivity" />
<activity android:name="com.microsoft.fluentuidemo.V2DesignTokensActivity" />
<activity android:name="com.microsoft.fluentuidemo.demos.V2DrawerActivity" />
<activity android:name="com.microsoft.fluentuidemo.demos.V2DrawerActivity"
android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name="com.microsoft.fluentuidemo.demos.V2LabelActivity" />
<activity android:name="com.microsoft.fluentuidemo.demos.V2ListItemActivity" />
<activity android:name="com.microsoft.fluentuidemo.demos.V2MenuActivity"

218
fluentui_drawer/src/main/java/com/microsoft/fluentui/tokenized/drawer/Drawer.kt
Просмотреть файл

@ -16,6 +16,7 @@ import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.focus.focusTarget
@ -628,124 +629,119 @@ private fun TopDrawer(
val fullHeight = constraints.maxHeight.toFloat()
var drawerHeight by remember(fullHeight) { mutableStateOf(fullHeight) }
//Get exact drawerHeight first.
val visible = remember { mutableStateOf(true) }
if (visible.value) {
Box(
modifier = Modifier
.layout { measurable, constraints ->
val placeable = measurable.measure(constraints)
layout(placeable.width, placeable.height) {
visible.value = false
drawerHeight =
placeable.height.toFloat() + dpToPx(DrawerHandleHeightOffset)
Box(
modifier = Modifier
.alpha(0f)
.layout { measurable, constraints ->
val placeable = measurable.measure(constraints)
layout(placeable.width, placeable.height) {
drawerHeight =
placeable.height.toFloat() + dpToPx(DrawerHandleHeightOffset)
}
}
) {
drawerContent()
}
val maxOpenHeight = fullHeight * DrawerOpenFraction
val minHeight = 0f
val topCloseHeight = minHeight
val topOpenHeight = min(maxOpenHeight, drawerHeight)
val minValue: Float = topCloseHeight
val maxValue: Float = topOpenHeight
val anchors = mapOf(
topCloseHeight to DrawerValue.Closed,
topOpenHeight to DrawerValue.Open
)
val drawerConstraints = with(LocalDensity.current) {
Modifier
.sizeIn(
maxWidth = constraints.maxWidth.toDp(),
maxHeight = constraints.maxHeight.toDp()
)
}
Scrim(
open = !drawerState.isClosed,
onClose = onDismiss,
fraction = {
calculateFraction(minValue, maxValue, drawerState.offset.value)
},
color = if (scrimVisible) scrimColor else Color.Transparent,
preventDismissalOnScrimClick = preventDismissalOnScrimClick,
onScrimClick = onScrimClick
)
Box(
drawerConstraints
.offset { IntOffset(0, 0) }
.semantics {
if (!drawerState.isClosed) {
dismiss {
onDismiss()
true
}
}
) {
drawerContent()
}
} else {
val maxOpenHeight = fullHeight * DrawerOpenFraction
val minHeight = 0f
val topCloseHeight = minHeight
val topOpenHeight = min(maxOpenHeight, drawerHeight)
val minValue: Float = topCloseHeight
val maxValue: Float = topOpenHeight
val anchors = mapOf(
topCloseHeight to DrawerValue.Closed,
topOpenHeight to DrawerValue.Open
)
val drawerConstraints = with(LocalDensity.current) {
Modifier
.sizeIn(
maxWidth = constraints.maxWidth.toDp(),
maxHeight = constraints.maxHeight.toDp()
)
}
Scrim(
open = !drawerState.isClosed,
onClose = onDismiss,
fraction = {
calculateFraction(minValue, maxValue, drawerState.offset.value)
},
color = if (scrimVisible) scrimColor else Color.Transparent,
preventDismissalOnScrimClick = preventDismissalOnScrimClick,
onScrimClick = onScrimClick
)
Box(
drawerConstraints
}
.height(
pxToDp(drawerState.offset.value)
)
.shadow(drawerElevation)
.clip(drawerShape)
.background(drawerBackground)
.swipeable(
state = drawerState,
anchors = anchors,
orientation = Orientation.Vertical,
enabled = false,
resistance = null
)
.focusable(false),
) {
ConstraintLayout(modifier = Modifier.padding(bottom = 8.dp)) {
val (drawerContentConstrain, drawerHandleConstrain) = createRefs()
Column(modifier = Modifier
.offset { IntOffset(0, 0) }
.semantics {
if (!drawerState.isClosed) {
dismiss {
onDismiss()
true
}
}
.padding(bottom = 8.dp)
.constrainAs(drawerContentConstrain) {
top.linkTo(parent.top)
bottom.linkTo(drawerHandleConstrain.top)
}
.height(
pxToDp(drawerState.offset.value)
)
.shadow(drawerElevation)
.clip(drawerShape)
.background(drawerBackground)
.swipeable(
state = drawerState,
anchors = anchors,
orientation = Orientation.Vertical,
enabled = false,
resistance = null
)
.focusable(false),
) {
ConstraintLayout(modifier = Modifier.padding(bottom = 8.dp)) {
val (drawerContentConstrain, drawerHandleConstrain) = createRefs()
Column(modifier = Modifier
.offset { IntOffset(0, 0) }
.padding(bottom = 8.dp)
.constrainAs(drawerContentConstrain) {
top.linkTo(parent.top)
bottom.linkTo(drawerHandleConstrain.top)
.focusTarget()
.testTag(DRAWER_CONTENT_TAG), content = { drawerContent() }
)
Column(horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.constrainAs(drawerHandleConstrain) {
top.linkTo(drawerContentConstrain.bottom)
bottom.linkTo(parent.bottom)
}
.focusTarget()
.testTag(DRAWER_CONTENT_TAG), content = { drawerContent() }
)
Column(horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.constrainAs(drawerHandleConstrain) {
top.linkTo(drawerContentConstrain.bottom)
bottom.linkTo(parent.bottom)
}
.fillMaxWidth()
.draggable(
orientation = Orientation.Vertical,
state = rememberDraggableState { delta ->
drawerState.performDrag(delta)
},
onDragStopped = { velocity ->
launch {
drawerState.performFling(
velocity
)
if (drawerState.isClosed) {
onDismiss()
}
.fillMaxWidth()
.draggable(
orientation = Orientation.Vertical,
state = rememberDraggableState { delta ->
drawerState.performDrag(delta)
},
onDragStopped = { velocity ->
launch {
drawerState.performFling(
velocity
)
if (drawerState.isClosed) {
onDismiss()
}
},
)
.testTag(DRAWER_HANDLE_TAG)
) {
Icon(
painterResource(id = R.drawable.ic_drawer_handle),
contentDescription = null,
tint = drawerHandleColor
}
},
)
}
.testTag(DRAWER_HANDLE_TAG)
) {
Icon(
painterResource(id = R.drawable.ic_drawer_handle),
contentDescription = null,
tint = drawerHandleColor
)
}
}
}