|
@@ -9,8 +9,7 @@ import androidx.compose.material.icons.outlined.Search
|
|
|
import androidx.compose.material3.Icon
|
|
|
import androidx.compose.material3.IconButton
|
|
|
import androidx.compose.material3.MaterialTheme
|
|
|
-import androidx.compose.material3.SmallTopAppBar
|
|
|
-import androidx.compose.material3.Text
|
|
|
+import androidx.compose.material3.TopAppBarScrollBehavior
|
|
|
import androidx.compose.runtime.Composable
|
|
|
import androidx.compose.runtime.LaunchedEffect
|
|
|
import androidx.compose.runtime.remember
|
|
@@ -19,6 +18,7 @@ import androidx.compose.ui.focus.FocusRequester
|
|
|
import androidx.compose.ui.focus.focusRequester
|
|
|
import androidx.compose.ui.graphics.SolidColor
|
|
|
import androidx.compose.ui.res.stringResource
|
|
|
+import eu.kanade.presentation.components.AppBar
|
|
|
import eu.kanade.tachiyomi.R
|
|
|
import eu.kanade.tachiyomi.ui.recent.history.HistoryPresenter
|
|
|
import eu.kanade.tachiyomi.ui.recent.history.HistoryState
|
|
@@ -27,17 +27,25 @@ import kotlinx.coroutines.delay
|
|
|
@Composable
|
|
|
fun HistoryToolbar(
|
|
|
state: HistoryState,
|
|
|
+ scrollBehavior: TopAppBarScrollBehavior,
|
|
|
+ incognitoMode: Boolean,
|
|
|
+ downloadedOnlyMode: Boolean,
|
|
|
) {
|
|
|
if (state.searchQuery == null) {
|
|
|
HistoryRegularToolbar(
|
|
|
onClickSearch = { state.searchQuery = "" },
|
|
|
onClickDelete = { state.dialog = HistoryPresenter.Dialog.DeleteAll },
|
|
|
+ incognitoMode = incognitoMode,
|
|
|
+ downloadedOnlyMode = downloadedOnlyMode,
|
|
|
+ scrollBehavior = scrollBehavior,
|
|
|
)
|
|
|
} else {
|
|
|
HistorySearchToolbar(
|
|
|
searchQuery = state.searchQuery!!,
|
|
|
onChangeSearchQuery = { state.searchQuery = it },
|
|
|
onClickCloseSearch = { state.searchQuery = null },
|
|
|
+ incognitoMode = incognitoMode,
|
|
|
+ downloadedOnlyMode = downloadedOnlyMode,
|
|
|
)
|
|
|
}
|
|
|
}
|
|
@@ -46,11 +54,12 @@ fun HistoryToolbar(
|
|
|
fun HistoryRegularToolbar(
|
|
|
onClickSearch: () -> Unit,
|
|
|
onClickDelete: () -> Unit,
|
|
|
+ incognitoMode: Boolean,
|
|
|
+ downloadedOnlyMode: Boolean,
|
|
|
+ scrollBehavior: TopAppBarScrollBehavior,
|
|
|
) {
|
|
|
- SmallTopAppBar(
|
|
|
- title = {
|
|
|
- Text(text = stringResource(id = R.string.history))
|
|
|
- },
|
|
|
+ AppBar(
|
|
|
+ title = stringResource(id = R.string.history),
|
|
|
actions = {
|
|
|
IconButton(onClick = onClickSearch) {
|
|
|
Icon(Icons.Outlined.Search, contentDescription = "search")
|
|
@@ -59,6 +68,9 @@ fun HistoryRegularToolbar(
|
|
|
Icon(Icons.Outlined.DeleteSweep, contentDescription = "delete")
|
|
|
}
|
|
|
},
|
|
|
+ downloadedOnlyMode = downloadedOnlyMode,
|
|
|
+ incognitoMode = incognitoMode,
|
|
|
+ scrollBehavior = scrollBehavior,
|
|
|
)
|
|
|
}
|
|
|
|
|
@@ -67,15 +79,12 @@ fun HistorySearchToolbar(
|
|
|
searchQuery: String,
|
|
|
onChangeSearchQuery: (String) -> Unit,
|
|
|
onClickCloseSearch: () -> Unit,
|
|
|
+ incognitoMode: Boolean,
|
|
|
+ downloadedOnlyMode: Boolean,
|
|
|
) {
|
|
|
val focusRequester = remember { FocusRequester.Default }
|
|
|
- SmallTopAppBar(
|
|
|
- navigationIcon = {
|
|
|
- IconButton(onClick = onClickCloseSearch) {
|
|
|
- Icon(Icons.Outlined.ArrowBack, contentDescription = "delete")
|
|
|
- }
|
|
|
- },
|
|
|
- title = {
|
|
|
+ AppBar(
|
|
|
+ titleContent = {
|
|
|
BasicTextField(
|
|
|
value = searchQuery,
|
|
|
onValueChange = onChangeSearchQuery,
|
|
@@ -87,6 +96,11 @@ fun HistorySearchToolbar(
|
|
|
cursorBrush = SolidColor(MaterialTheme.colorScheme.onBackground),
|
|
|
)
|
|
|
},
|
|
|
+ navigationIcon = Icons.Outlined.ArrowBack,
|
|
|
+ navigateUp = onClickCloseSearch,
|
|
|
+ isActionMode = false,
|
|
|
+ downloadedOnlyMode = downloadedOnlyMode,
|
|
|
+ incognitoMode = incognitoMode,
|
|
|
)
|
|
|
LaunchedEffect(focusRequester) {
|
|
|
// TODO: https://issuetracker.google.com/issues/204502668
|