prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better state handling of the reader bottom sheet

Browse source
This commit is contained in:
Jackson Harper 2023-05-15 15:36:06 +08:00
parent 49af48a695
commit 549481020b
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/WebReaderLoadingContainer.kt
View file

@ -190,7 +190,9 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
when (bottomSheetState) {
BottomSheetState.PREFERENCES -> {
coroutineScope.launch {
modalBottomSheetState.show()
if (!modalBottomSheetState.isVisible) {
modalBottomSheetState.show()
}
}
}
BottomSheetState.NOTEBOOK -> {
@ -252,14 +254,12 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
onSave = {
webReaderViewModel.saveAnnotation(it)
coroutineScope.launch {
modalBottomSheetState.hide()
webReaderViewModel.resetBottomSheet()
}
},
onCancel = {
webReaderViewModel.cancelAnnotationEdit()
coroutineScope.launch {
modalBottomSheetState.hide()
webReaderViewModel.resetBottomSheet()
}
}
@ -274,7 +274,6 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
initialSelectedLabels = webReaderParams?.labels ?: listOf(),
onCancel = {
coroutineScope.launch {
modalBottomSheetState.hide()
webReaderViewModel.resetBottomSheet()
}
},
@ -286,7 +285,6 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
)
}
coroutineScope.launch {
modalBottomSheetState.hide()
webReaderViewModel.resetBottomSheet()
}
},
@ -347,7 +345,6 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
IconButton(onClick = {
coroutineScope.launch {
webReaderViewModel.setBottomSheet(BottomSheetState.NOTEBOOK)
modalBottomSheetState.show()
}
}) {
Icon(
@ -360,7 +357,6 @@ fun WebReaderLoadingContainer(slug: String? = null, requestID: String? = null,
IconButton(onClick = {
coroutineScope.launch {
webReaderViewModel.setBottomSheet(BottomSheetState.PREFERENCES)
modalBottomSheetState.show()
}
}) {
Icon(