mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2026-01-24 12:34:04 +01:00
Code Issues Projects Releases Wiki Activity

Add source close button

Browse Source
This commit is contained in:
Syer10
2021-05-28 20:24:12 -04:00
parent c409f7d1a2
commit 9e540ce411
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/ca/gosyer/ui/base/components/Toolbar.kt
View File

@@ -49,6 +49,7 @@ fun Toolbar(
name: String,
router: BackStack<Route>? = null,
closable: Boolean,
onClose: () -> Unit = { router?.pop() },
modifier: Modifier = Modifier,
actions: @Composable RowScope.() -> Unit = {},
backgroundColor: Color = MaterialTheme.colors.surface, // CustomColors.current.bars,
@@ -95,9 +96,7 @@ fun Toolbar(
actions()
if (closable) {
IconButton(
onClick = {
router?.pop()
}
onClick = onClose
) {
Icon(FontAwesomeIcons.Regular.WindowClose, "close", Modifier.size(52.dp))
}

14
src/main/kotlin/ca/gosyer/ui/sources/SourcesMenu.kt
View File

@@ -9,8 +9,7 @@ package ca.gosyer.ui.sources
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
@@ -64,7 +63,13 @@ fun SourcesMenu(bundle: Bundle, onMangaClick: (Long) -> Unit) {
Surface {
Column {
Toolbar(selectedSourceTab?.name ?: "Sources", closable = false)
Toolbar(
selectedSourceTab?.name ?: "Sources",
closable = selectedSourceTab != null,
onClose = {
selectedSourceTab?.let { vm.closeTab(it) }
}
)
Row {
Surface(elevation = 1.dp) {
LazyColumn(Modifier.fillMaxHeight().width(64.dp)) {
@@ -80,8 +85,7 @@ fun SourcesMenu(bundle: Bundle, onMangaClick: (Long) -> Unit) {
}
}
)
.requiredHeight(64.dp)
.requiredWidth(64.dp)
.requiredSize(64.dp)
if (source != null) {
KtorImage(source.iconUrl(serverUrl), imageModifier = modifier)